Merge branch 'main' into storybook

iva2k · Jul 19, 2024 · fa791e9 · fa791e9
2 parents 78b287e + cfc421f
commit fa791e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scripts/git-merge_main-to-all-ui.sh b/scripts/git-merge_main-to-all-ui.sh
@@ -536,8 +536,10 @@ main() {
 
   mkdir -p "$(dirname "$LOGFILE")" >/dev/null
   if [ "$print_last" -ne 0 ]; then
-    [ ! -f "$STATE_FILE_BACKUP" ] && { echo "No last run file \"$STATE_FILE_BACKUP\"."; exit 1; }
-    load_state $STATE_FILE_BACKUP
+    file="$STATE_FILE"
+    [ ! -f "$file" ] && { file="$STATE_FILE_BACKUP"; }
+    [ ! -f "$file" ] && { echo "No current run file \"$STATE_FILE\" found and no last run file \"$STATE_FILE_BACKUP\" found."; exit 1; }
+    load_state "$file"
     print_summary
     return 0
   elif [ "$continue_merge" -ne 0 ]; then

diff --git a/scripts/git-run-all-in-branches.sh b/scripts/git-run-all-in-branches.sh
@@ -408,8 +408,10 @@ main() {
 
   mkdir -p "$(dirname "$LOGFILE")" >/dev/null
   if [ "$print_last" -ne 0 ]; then
-    [ ! -f "$STATE_FILE_BACKUP" ] && { echo "No last run file \"$STATE_FILE_BACKUP\"."; exit 1; }
-    load_state $STATE_FILE_BACKUP
+    file="$STATE_FILE"
+    [ ! -f "$file" ] && { file="$STATE_FILE_BACKUP"; }
+    [ ! -f "$file" ] && { echo "No current run file \"$STATE_FILE\" found and no last run file \"$STATE_FILE_BACKUP\" found."; exit 1; }
+    load_state "$file"
     print_summary
     return 0
   else