Small fixes to sync scripts

desihub · Mar 5, 2024 · b553756 · b553756
1 parent cec5618
commit b553756
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/etc/desimodel_sync_kpno_cron.sh b/etc/desimodel_sync_kpno_cron.sh
@@ -74,15 +74,11 @@ else
     echo "Try loading focalplane model at ${DESIMODEL}... " >> "${logfile}"
     PYTHON_CODE=$(cat <<END
 from fiberassign.hardware import load_hardware
-try:
-    hw = load_hardware()
-    print("yes")
-except:
-    print("no")
+hw = load_hardware()
 END
 )
-    result="$(python3 -c "$PYTHON_CODE")"
-    if [ "x$result" = "xyes" ]; then
+    result=$(python3 -c "$PYTHON_CODE")
+    if [ $? -eq 0 ]; then
         echo "SUCCESS" >> "${logfile}"
         # Now commit result
         mesg="Appending DB sync ${calfile} to current focalplane model"

diff --git a/etc/desimodel_sync_kpno_force.sh b/etc/desimodel_sync_kpno_force.sh
@@ -76,15 +76,11 @@ else
     echo "Try loading focalplane model at ${DESIMODEL}... " >> "${logfile}"
     PYTHON_CODE=$(cat <<END
 from fiberassign.hardware import load_hardware
-try:
-    hw = load_hardware()
-    print("yes")
-except:
-    print("no")
+hw = load_hardware()
 END
 )
-    result="$(python3 -c "$PYTHON_CODE")"
-    if [ "x$result" = "xyes" ]; then
+    result=$(python3 -c "$PYTHON_CODE")
+    if [ $? -eq 0 ]; then
         echo "SUCCESS" >> "${logfile}"
         # Now commit result
         mesg="Appending DB sync ${calfile} to current focalplane model"