Changes to camViewer

scripts/camViewer

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
-PATH=$PATH:$DIR
+PATH=$DIR:$PATH
 
 #
 # find_pv: use find_pv to get to the sysreset PV of the IOC for rebooting.
@@ -37,8 +37,8 @@ tmp=/tmp/cv.$$
 cat "$VIEWERCFG" | grep -i "$NAME" | grep -v '#' | awk -F, '{ if (split($2,a,";")==1) n=$2; else n=a[2]; gsub(" ","",n); gsub(" ","",$4); printf "%s %s\n", n, $4; }' >$tmp
 c=$(wc -l <$tmp)
 if [ "$c" -eq 0 ]; then
-    VIEWERCFG='/reg/g/pcds/pyps/config/*/camviewer.cfg'
-    cat "$VIEWERCFG" | grep -i "$NAME" | grep -v '#' | awk -F, '{ if (split($2,a,";")==1) n=$2; else n=a[2]; gsub(" ","",n); gsub(" ","",$4); printf "%s %s\n", n, $4; }' >$tmp
+    VIEWERCFG=/reg/g/pcds/pyps/config/*/camviewer.cfg
+    cat $VIEWERCFG | grep -i "$NAME" | grep -v '#' | awk -F, '{ if (split($2,a,";")==1) n=$2; else n=a[2]; gsub(" ","",n); gsub(" ","",$4); printf "%s %s\n", n, $4; }' >$tmp
     c=$(wc -l <$tmp)
     if [ "$c" -eq 0 ]; then
 	echo "No match for $1"
@@ -104,14 +104,14 @@ HUTCH=$(echo "$1" | tr a-z A-Z)
 hutch=$(echo "$1" | tr A-Z a-z)
 
 ALLVIEWERCFG=/reg/g/pcds/pyps/config/*/camviewer.cfg
-echo cat "$ALLVIEWERCFG" | grep -v '#' | awk -F, '{ if (split($2,a,";")==1) n=$2; else n=a[2]; gsub(" ","",n); gsub(" ","",$4); printf "%s %s\n", n, $4; }' 
+echo cat $ALLVIEWERCFG | grep -v '#' | awk -F, '{ if (split($2,a,";")==1) n=$2; else n=a[2]; gsub(" ","",n); gsub(" ","",$4); printf "%s %s\n", n, $4; }' 
 
 VIEWERCFGLFE=/reg/g/pcds/pyps/config/lfe/camviewer.cfg
 VIEWERCFG=/reg/g/pcds/pyps/config/$hutch/camviewer.cfg
 VIEWERCFGXRT=/reg/g/pcds/pyps/config/xrt/camviewer.cfg
 
 if  [ "$hutch" != 'tmo' ] && [ "$hutch" != 'rix' ]; then
-    for gige_cam in $(grep -v '#' $VIEWERCFGLFE | awk -F, '{print $4 "\n" '); do
+    for gige_cam in $(grep -v '#' $VIEWERCFGLFE | awk -F, '{print $4 "\n"} '); do
         echo "$gige_cam"
     done
 
@@ -148,26 +148,27 @@ usage: $0 options
 start the viewer for controls cameras
 
 OPTIONS:
--c:            camera name as in camera list or gige #
--m:            bring up the edm screen
--r:            reboot the IOC
--l:            print list of cameras
--w #:         (wait for # hours to ask to renew, default 2 and 12 for GIGEs)
--u #:          update rate limit (default 5)
--H hutch:      use a specific hutches camviewer config file
--e|--enable:   enable camera ioc
--d|--disable:  disable camera ioc
+-c|--cam    :   camera name as in camera list or gige #
+-m|--main   :   bring up the edm screen
+-r|--reboot :   reboot the IOC
+-l|--list   :   print list of cameras
+-w|--wait # :   (wait for # hours to ask to renew, default 2 and 12 for GIGEs)
+-u|--rate # :   update rate limit (default 5)
+-H|--hutch  :   use a specific hutches camviewer config file
+-e|--enable :   enable camera ioc
+-d|--disable:   disable camera ioc
 EOF
 }
 
 if [[ ($1 == "--help") || ($1 == "-h") ]]; then
 	usage
 	exit 0
 fi
+
 
 LIST=0
 CAMNUM=0
-CAMNAME=0
+CAM=0
 WAIT=0
 RATE=-1
 REBOOT=0
@@ -176,38 +177,52 @@ DISABLE=0
 MAINSCREEN=0
 
 
-while getopts " -o c:w:u:H:lmre:(enable)d:(disable)" OPTION
+OPTIONS=$(getopt -o lmredc:w:u:H: --long list,main,reboot,enable,disable,cam:,wait:rate:hutch: -- "$@")
 
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTIONS"
+
+while [ : ]
 do
-    case $OPTION in
-	l)
-	    LIST=1	  
-	    ;;
-	c)
-	    CAM=$OPTARG
-	    ;;
-	w)
-	    WAIT=$OPTARG
-	    ;;	    
-	u)
-	    RATE=$OPTARG
-	    ;;	    
-	H)
-	    hutch=$OPTARG
-	    ;;
-	m)
-	    MAINSCREEN=1
-	    ;;
-	r)
-	    REBOOT=1
-	    ;;
-        e|enable)
+    case "$1" in
+        -l|--list)  
+            LIST=1
+            shift
+            ;;
+        -c|--cam)
+            CAM=$2
+            shift 2 ;;
+        -w|--wait)
+            WAIT=$2
+            shift 2 ;;
+        -u|--rate)
+            RATE=$2
+            shift 2 ;;
+        -H|--hutch)
+            hutch=$2
+            shift 2 ;;
+        -m|--main)
+            MAINSCREEN=1
+            shift
+            ;;
+        -r|--rate)
+            REBOOT=1
+            shift
+            ;;
+        -e|--enable)
             ENABLE=1
+            shift
             ;;
-        d|disable)
+        -d|--disable)
             DISABLE=1
+            shift
+            ;;
+        --) shift 
+            break 
             ;;
-	esac
+
+    esac
 done