Commit: b4ef318f59ca2d08c2cb76ec64404f2e32170f9e - Fs-scripts (git)

Commit MetaInfo

• Revision: b4ef318f59ca2d08c2cb76ec64404f2e32170f9e (tree)
• Time: 2023-01-07 18:24:33
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

deal with set -e

Signed-off-by: Fs <[e-mail]>

Change Summary

• modified: qt6_deploy_host.sh

Incremental Difference

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -13,7 +13,7 @@ if [ $# -lt 2 ]; then
 	exit 1
 fi
 
-set -e
+set -ex
 
 PATH_TO_TARGET=`realpath "$1"`
 PATH_TO_HOST=`realpath "$2"`
@@ -63,13 +63,11 @@ chmod +x "${PATH_TO_TARGET}/bin/qmake"
 GNU_SED=
 
 for SED_PROGRAM in gsed sed; do
-	GSED_OUTPUT="`LANG=C $SED_PROGRAM --help 2> /dev/null`"
-	if [ $? -eq 0 ] ; then
-		if echo "$GSED_OUTPUT" | grep -q -F "GNU sed"; then
-			echo "Found GNU sed: $SED_PROGRAM"
-			GNU_SED=$SED_PROGRAM
-			break
-		fi
+	GSED_OUTPUT="`LANG=C $SED_PROGRAM --help 2> /dev/null || :`"
+	if echo "$GSED_OUTPUT" | grep -q -F "GNU sed"; then
+		echo "Found GNU sed: $SED_PROGRAM"
+		GNU_SED=$SED_PROGRAM
+		break
 	fi
 done