From b553756bb2ae96158c107fec8685a0c20e23ceb0 Mon Sep 17 00:00:00 2001
From: Theodore Kisner <tskisner.public@gmail.com>
Date: Tue, 5 Mar 2024 12:56:50 -0800
Subject: [PATCH] Small fixes to sync scripts

---
 etc/desimodel_sync_kpno_cron.sh  | 10 +++-------
 etc/desimodel_sync_kpno_force.sh | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/etc/desimodel_sync_kpno_cron.sh b/etc/desimodel_sync_kpno_cron.sh
index b147740..7d255d1 100755
--- 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
index 2a18ca3..4bbe00a 100755
--- 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"