Merge pull request #155 from vespos/camviewer_hutch_auto

(re)add hutch autodiscovery
pcdshub · Jun 7, 2023 · b246801 · b246801
2 parents 338b286 + cadda96
commit b246801
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/scripts/camViewer b/scripts/camViewer
@@ -264,8 +264,16 @@ if [ $# -ge 1 ]; then
     exit 1
 fi
 
-verify-hutch "$hutch"
+if ! verify-hutch "$hutch"; then
+    hutch=$(get_info --gethutch)
+    if [ "$hutch" == unknown_hutch ]; then
+        echo 'Unknown hutch, specify using -H option with a valid hutch name.'
+        usage
+        exit 1
+    fi
+fi
 
+echo "Launching camViewer for $hutch."
 
 EXE="/reg/g/pcds/pyps/config/$hutch/camviewer/run_viewer.csh"
 PVLIST="/reg/g/pcds/pyps/config/$hutch/camviewer.cfg"