X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=spice-example-sh;h=6fe5c1f59ba4239ff6d97d2a7ebcf69fffe93c7e;hb=11064d3263b9a3620c4ca43cded829e62b235de9;hp=62192f3e9a76826056d67d8c6510427394fcebab;hpb=6d4134778006931c04d53519e8894651bdab1773;p=pve-manager.git

diff --git a/spice-example-sh b/spice-example-sh
index 62192f3e..6fe5c1f5 100755
--- a/spice-example-sh
+++ b/spice-example-sh
@@ -22,10 +22,10 @@ USERNAME=""
 while getopts ":u:p:" o; do
     case "${o}" in
         u)
-            USERNAME=${OPTARG}
+            USERNAME="${OPTARG}"
             ;;
         p)
-            PASSWORD=${OPTARG}
+            PASSWORD="${OPTARG}"
             ;;
         *)
             usage
@@ -35,42 +35,44 @@ done
 
 shift $((OPTIND-1))
 
-if [ -z $PASSWORD ]; then
+if [[ -z "$PASSWORD" ]]; then
     PASSWORD=""
 fi
-if [ -z $USERNAME ]; then
-    USERNAME=root@pam
+if [[ -z "$USERNAME" ]]; then
+    USERNAME='root@pam'
 fi
 
-DEFAULTHOST=$(hostname -f)
+DEFAULTHOST="$(hostname -f)"
 
 # select VM
-[ -z $1 ] && usage
-VMID=$1
+[[ -z "$1" ]] && usage
+VMID="$1"
 
-#[ -z $2 ] && usage
-NODE=${2:-$DEFAULTHOST}
+#[[ -z "$2" ]] && usage
+NODE="${2:-$DEFAULTHOST}"
 
-if [ -z $3 ]; then
-    PROXY=$NODE
+if [[ -z "$3" ]]; then
+    PROXY="$NODE"
 else
-    PROXY=$3
+    PROXY="$3"
 fi
 
-NODE=${NODE%%\.*}
+NODE="${NODE%%\.*}"
 
-DATA=$(curl -f -s -S -k -d "username=$USERNAME&password=$PASSWORD"  https://$PROXY:8006/api2/json/access/ticket)
+DATA="$(curl -f -s -S -k --data-urlencode "username=$USERNAME" --data-urlencode "password=$PASSWORD" "https://$PROXY:8006/api2/json/access/ticket")"
 
 echo "AUTH OK"
 
-TICKET=${DATA//\"/}
-TICKET=${TICKET##*ticket:}
-TICKET=${TICKET%%,*}
+TICKET="${DATA//\"/}"
+TICKET="${TICKET##*ticket:}"
+TICKET="${TICKET%%,*}"
+TICKET="${TICKET%%\}*}"
 
-CSRF=${DATA//\"/}
-CSRF=${CSRF##*CSRFPreventionToken:}
-CSRF=${CSRF%%,*}
+CSRF="${DATA//\"/}"
+CSRF="${CSRF##*CSRFPreventionToken:}"
+CSRF="${CSRF%%,*}"
+CSRF="${CSRF%%\}*}"
 
-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
+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
+exec remote-viewer spiceproxy