exit on err

wysaid · May 5, 2024 · c6682ac · c6682ac
1 parent bb733f3
commit c6682ac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/build_script/x264/build_android_all.sh b/build_script/x264/build_android_all.sh
@@ -10,6 +10,8 @@ THIS_DIR=$(
     pwd
 )
 
+set -e
+
 X264_DIR=$1
 
 echo "THIS_DIR=$THIS_DIR"
@@ -18,13 +20,13 @@ cd $X264_DIR
 git clean -fdx
 
 # Build arm v6 v7a
-bash $THIS_DIR/build_android_arm.sh "$X264_DIR" || exit 1
+bash $THIS_DIR/build_android_arm.sh "$X264_DIR"
 
 # Build arm64 v8a
-bash $THIS_DIR/build_android_arm64-v8a.sh "$X264_DIR" || exit 1
+bash $THIS_DIR/build_android_arm64-v8a.sh "$X264_DIR"
 
 # Build x86
-bash $THIS_DIR/build_android_x86.sh "$X264_DIR" || exit 1
+bash $THIS_DIR/build_android_x86.sh "$X264_DIR"
 
 # Build x86_64
-bash $THIS_DIR/build_android_x86_64.sh "$X264_DIR" || exit 1
+bash $THIS_DIR/build_android_x86_64.sh "$X264_DIR"
diff --git a/build_script/x264/build_android_arm.sh b/build_script/x264/build_android_arm.sh
@@ -6,6 +6,8 @@ pwd
 
 git clean -fd
 
+set -e
+
 export NDK_STANDALONE_TOOLCHAIN=$NDK_TOOLCHAIN_DIR/arm
 
 if [[ ! -d "${NDK_STANDALONE_TOOLCHAIN}" ]]; then

diff --git a/build_script/x264/build_android_arm64-v8a.sh b/build_script/x264/build_android_arm64-v8a.sh
@@ -6,6 +6,8 @@ pwd
 
 git clean -fd
 
+set -e
+
 export NDK_STANDALONE_TOOLCHAIN=$NDK_TOOLCHAIN_DIR/arm64
 
 if [[ ! -d "${NDK_STANDALONE_TOOLCHAIN}" ]]; then

diff --git a/build_script/x264/build_android_x86.sh b/build_script/x264/build_android_x86.sh
@@ -6,6 +6,8 @@ pwd
 
 git clean -fd
 
+set -e
+
 export NDK_STANDALONE_TOOLCHAIN=$NDK_TOOLCHAIN_DIR/x86
 
 if [[ ! -d "${NDK_STANDALONE_TOOLCHAIN}" ]]; then

diff --git a/build_script/x264/build_android_x86_64.sh b/build_script/x264/build_android_x86_64.sh
@@ -5,6 +5,7 @@ echo "param = $1"
 pwd
 
 git clean -fd
+set -e
 
 export NDK_STANDALONE_TOOLCHAIN=$NDK_TOOLCHAIN_DIR/x86_64
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ pwd @@
     git clean -fd
+    set -e
     export NDK_STANDALONE_TOOLCHAIN=$NDK_TOOLCHAIN_DIR/arm
     if [[ ! -d "${NDK_STANDALONE_TOOLCHAIN}" ]]; then
@@ Expand Down @@