Fix: spice clients support

1 files changed, 9 insertions, 7 deletions

diff --git a/kvmx b/kvmx
index fb0faec..1ca55e1 100755
--- a/kvmx
+++ b/kvmx
@@ -257,10 +257,17 @@ function kvmx_spice {
   if [ "$spice_client" == "spicy" ] && which spicy &> /dev/null; then
     #spicy -h localhost -p $PORT &
     spicy --uri=spice+unix://$SPICESOCKET &
-  elif [ "$spice_client" == "virt-viewer" ] && which virt-viewer &> /dev/null; then
+  elif [ "$spice_client" == "remote-viewer" ] && which remote-viewer &> /dev/null; then
     #remote-viewer spice://localhost:$PORT &
     remote-viewer spice+unix://$SPICESOCKET &
-  #elif [ ! -z "$spice_client" ] && [ "$spice_client" != "spicec" ]; then
+  # This is untested due to libvirt requirements
+  elif [ "$spice_client" == "virt-viewer" ] && which virt-viewer &> /dev/null; then
+    #virt-viewer spice://localhost:$PORT &
+    virt-viewer spice+unix://$SPICESOCKET &
+  # Unsupported as spicec was deprecated
+  #elif [ "$spice_client" != "spicec" ] && which spicec &> /dev/null; then
+  #  # https://lists.freedesktop.org/archives/spice-devel/2013-September/014643.html
+  #  SPICE_NOGRAB=1 spicec --host localhost --port $PORT &> $SPICELOG &
   elif [ ! -z "$spice_client" ]; then
     echo "$BASENAME: spice_client $spice_client not currently supported"
     exit 1
@@ -269,11 +276,6 @@ function kvmx_spice {
       #spicy -h localhost -p $PORT &
       spicy --uri=spice+unix://$SPICESOCKET &
     fi
-
-    #if which spicec &> /dev/null; then
-    #  # https://lists.freedesktop.org/archives/spice-devel/2013-September/014643.html
-    #  SPICE_NOGRAB=1 spicec --host localhost --port $PORT &> $SPICELOG &
-    #fi
   fi
 
   SPICEPID="$!"