From 6d4134778006931c04d53519e8894651bdab1773 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 3 Apr 2014 06:58:08 +0200
Subject: [PATCH] spice-example-sh: improve error handling

---
 spice-example-sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spice-example-sh b/spice-example-sh
index ae280e7d..62192f3e 100755
--- a/spice-example-sh
+++ b/spice-example-sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # needs pve-manager >= 3.1-44
 
 usage() { 
@@ -57,7 +59,9 @@ fi
 
 NODE=${NODE%%\.*}
 
-DATA=`curl -k -d "username=$USERNAME&password=$PASSWORD"  https://$PROXY:8006/api2/json/access/ticket` 
+DATA=$(curl -f -s -S -k -d "username=$USERNAME&password=$PASSWORD"  https://$PROXY:8006/api2/json/access/ticket)
+
+echo "AUTH OK"
 
 TICKET=${DATA//\"/}
 TICKET=${TICKET##*ticket:}
@@ -67,6 +71,6 @@ CSRF=${DATA//\"/}
 CSRF=${CSRF##*CSRFPreventionToken:}
 CSRF=${CSRF%%,*}
 
-curl -k -b "PVEAuthCookie=$TICKET" -H "CSRFPreventionToken: $CSRF" https://$PROXY:8006/api2/spiceconfig/nodes/$NODE/qemu/$VMID/spiceproxy -d "proxy=$PROXY" > spiceproxy
+curl -f -s -S -k -b "PVEAuthCookie=$TICKET" -H "CSRFPreventionToken: $CSRF" https://$PROXY:8006/api2/spiceconfig/nodes/$NODE/qemu/$VMID/spiceproxy -d "proxy=$PROXY" > spiceproxy
 
 remote-viewer spiceproxy