refactor: change trigger_is_started to be exact

GaloyMoney · Dec 23, 2023 · 0259cbb · 0259cbb
1 parent ada3650
commit 0259cbb
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/bats/helpers/trigger.bash b/bats/helpers/trigger.bash
@@ -13,14 +13,9 @@ trigger_is_stopped() {
 }
 
 trigger_is_started() {
-  local NUM_LINES=18
-  cat $TILT_LOG_FILE | grep 'api-trigger │' \
-    | tail -n $NUM_LINES \
-    | grep "Successfully stopped trigger"
+    lastLineNum=$(grep -n 'Successfully stopped trigger' "$TILT_LOG_FILE" | tail -1 | cut -d: -f1)
+    if [[ -z "$lastLineNum" ]]; then lastLineNum=0; fi
 
-  if [[ "$?" == "0" ]]; then
-    return 1
-  else
-    return 0
-  fi
+    tail -n +$((lastLineNum + 1)) "$TILT_LOG_FILE" | grep -q 'finish updating pending invoices'
+    return $?
 }