Fix Style

benedikt-schesch · Sep 26, 2023 · 3df8d8a · 3df8d8a
1 parent 1ca6756
commit 3df8d8a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 23 deletions.
diff --git a/src/scripts/merge_tools/gitmerge_ort.sh b/src/scripts/merge_tools/gitmerge_ort.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s ort"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 1
 fi
diff --git a/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s ort -Xignore-space-change"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 1
 fi
diff --git a/src/scripts/merge_tools/gitmerge_ort_imports.sh b/src/scripts/merge_tools/gitmerge_ort_imports.sh
@@ -7,14 +7,11 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s ort"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -e 0 ] ; then
+if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 0
 fi
 
 cd "$clone_dir"
-"$MERGE_SCRIPTS_DIR"/resolve-import-conflicts
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then
   exit 1
 fi
-
diff --git a/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh
@@ -7,13 +7,11 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s ort -Xignore-space-change"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -e 0 ] ; then
+if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 0
 fi
 
 cd "$clone_dir"
-"$MERGE_SCRIPTS_DIR"/resolve-import-conflicts
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then
   exit 1
 fi
diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s recursive -Xignore-space-change"
-"$MERGE_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
-  exit 1
+if ! "$MERGE_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
+    exit 1
 fi
diff --git a/src/scripts/merge_tools/gitmerge_recursive_minimal.sh b/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s recursive -Xdiff-algorithm=minimal"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
-  exit 1
+if ! "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
+    exit 1
 fi
diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers.sh b/src/scripts/merge_tools/gitmerge_recursive_myers.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s recursive -Xdiff-algorithm=myers"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 1
 fi
diff --git a/src/scripts/merge_tools/gitmerge_recursive_patience.sh b/src/scripts/merge_tools/gitmerge_recursive_patience.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s recursive -Xdiff-algorithm=patience"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 1
 fi