Merge remote-tracking branch 'lunaetic/sync-cmd-exit-on-error' into d…

…evelop
wardenenv · Mar 1, 2020 · 5157429 · 5157429
2 parents 0d8b0f9 + e2e54cd
commit 5157429
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/commands/sync.cmd b/commands/sync.cmd
@@ -51,8 +51,17 @@ case "${WARDEN_PARAMS[0]}" in
 
         ## wait for sync session to complete initial sync before exiting
         echo "Waiting for initial synchronization to complete"
-        while !  mutagen sync list --label-selector "warden-sync=${WARDEN_ENV_NAME}" \
-            | grep -i 'watching for changes'>/dev/null; do printf .; sleep 1; done; echo
+        while ! mutagen sync list --label-selector "warden-sync=${WARDEN_ENV_NAME}" \
+            | grep -i 'watching for changes'>/dev/null;
+                do
+                    if mutagen sync list --label-selector "warden-sync=${WARDEN_ENV_NAME}" \
+                        | grep -i 'Last error' > /dev/null; then
+                        MUTAGEN_ERROR=$(mutagen sync list --label-selector "warden-sync=${WARDEN_ENV_NAME}" \
+                            | sed -n 's/Last error: \(.*\)/\1/p')
+                        >&2 printf "\033[31m\nMutagen encountered an error during sync: ${MUTAGEN_ERROR}\n\033[0m"
+                        exit 1
+                    fi
+                    printf .; sleep 1; done; echo
         ;;
     stop)
         ## terminate only sessions labeled with this env name