Merge pull request #22 from 5long/test-github-actions

Don't exit when P3WM_MERGE_TOOL exits non-zero
5long · May 25, 2023 · 51ccf3d · 51ccf3d
2 parents f43501e + 34382ea
commit 51ccf3d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bin/p3wm b/bin/p3wm
@@ -222,8 +222,10 @@ main() {
   bf_base="$(prepare_bf_base "$bf_local")"
   bf_merged="$(prepare_bf_merged "$bf_local")"
 
-  "$P3WM_MERGE_TOOL" "$bf_local" "$bf_base" "$bf_pacnew" > "$bf_merged"
-  bf_success="$?"
+  bf_success=0
+
+  "$P3WM_MERGE_TOOL" "$bf_local" "$bf_base" "$bf_pacnew" > "$bf_merged" \
+    || bf_success="$?"
 
   if [[ $bf_success == 0 ]]; then
     echo M "$bf_local" "can be cleanly merged"