fix probable bug

1 files changed, 7 insertions, 10 deletions

diff --git a/selfpublish.sh b/selfpublish.sh
index bdbb3be..f8e4a4f 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -180,20 +180,17 @@ wait_for_certificate_issuance()
 {
         local f state
         f=/etc/apache2/md/domains/"$1"/md.json
+        set=$-
+        set +x
         echo -n Waiting for certificate... >&2
         while true
         do
-                set=$-
-                set +x
-                if [ -e "$f" ]
+                if [ -e "$f" ] &&
+                   state=$(sed -ne 's/^ *"state": *\([0-9]\+\),/\1/p' "$f") &&
+                   [ "$state" = 2 ]
                 then
-                        state=$(sed -ne 's/^ *"state": *\([0-9]\+\),/\1/p' "$f")
-
-                        if [ "$state" = 2 ]
-                        then
-                                set $set
-                                return
-                        fi
+                        set $set
+                        return
                 fi
                 sleep 1
                 echo -n . >&2