better currentuser handling

whitespace fun

diff --git a/kvm-shell b/kvm-shell
index a08fe5e..c20fbae 100644 (file)
--- a/kvm-shell
+++ b/kvm-shell
@@ -40,8 +40,11 @@ set -E
 
 # configuration
 USERSFILE=/etc/kvm-shell-users
-CURRENTUSER=$USER
-### test:    CURRENTUSER=vuser1
+CURRENTUSER=${USER:-""}
+if [-z ${CURRENTUSER} ]; then
+    echo "Unknown user"
+    exit 1
+fi
 SUDO=/usr/bin/sudo
 VIRSH=/usr/bin/virsh
 VNCBASEPORT=5900
@@ -59,10 +62,10 @@ function select_vm {
     COUNTER=0
     NEWAVAILABLEVMS=""
     for i in $AVAILABLEVMS; do
-       set +e
+           set +e
         $SUDO $VIRSH domstate $i 2>/dev/null
-       foo=$?
-       set -e
+           foo=$?
+           set -e
         if [ "$foo" = "0" ]; then
             NEWAVAILABLEVMS="${NEWAVAILABLEVMS} ${i}"
             COUNTER=$((COUNTER+1))
@@ -75,7 +78,7 @@ function select_vm {
     selectedvm=`dialog --stdout --title "User $CURRENTUSER - please select your VM to manage" --menu "Available VMs:" 15 55 $COUNTER $MENUITEMS`
     ret=$?
     case $ret in
-       0)
+           0)
             [ $DEBUG -eq 1 ] && echo "selected: $selectedvm"
             while [ $MYEXIT -ne 2 ];
             do
@@ -83,10 +86,10 @@ function select_vm {
             done
             MYEXIT=0
             ;;
-       1)
+           1)
             [ $DEBUG -eq 1 ] && echo "You pressed cancel."
             MYEXIT=1;;
-       255)
+           255)
             [ $DEBUG -eq 1 ] && echo "You hit Esc."
             MYEXIT=1;;
     esac
@@ -111,15 +114,15 @@ function select_action {
     ret=$?
     clear
     case $ret in
-       0)
+           0)
             #echo "$SUDO $VIRSH $selectedaction $selectedvm"
             case $selectedaction in
-               dominfo|console|start|shutdown|reboot|destroy)
-                   set +e
+                       dominfo|console|start|shutdown|reboot|destroy)
+                           set +e
                     $SUDO $VIRSH $selectedaction $selectedvm
-                   set -e
+                           set -e
                     ;;
-               vncdisplay)
+                       vncdisplay)
                     VNCDSP=`$SUDO $VIRSH vncdisplay $selectedvm | grep -v "^$" | sed -e "s/://g"`
                     VNCDSP=$((VNCBASEPORT+VNCDSP))
                     echo "VNC port: $VNCDSP"
@@ -128,11 +131,11 @@ function select_action {
             sleep 1
             read -p "[Hit Return]" x
             ;;
-       1)
+           1)
             [ $DEBUG -eq 1 ] && echo "You pressed cancel."
             MYEXIT=2
             ;;
-       255)
+           255)
             [ $DEBUG -eq 1 ] && echo "You hit Esc."
             MYEXIT=2
             ;;