AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace die with killProcess in apple_compile

Browse source
This commit is contained in:
Alex Korzh 2022-04-29 18:02:38 +04:00
parent 531e0ad19d
commit 7ff6b64742
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/scripts/apple_compile.sh
View file

@ -76,7 +76,7 @@ fetch() {
return return
fi fi
die "You must have 'wget' or 'curl' installed." killProcess "You must have 'wget' or 'curl' installed."
} }
sha256() { sha256() {
@ -90,7 +90,7 @@ sha256() {
return 0 return 0
fi fi
die "You must have 'sha256sum' or 'openssl' installed." killProcess "You must have 'sha256sum' or 'openssl' installed."
} }
if [[ "$OS" != "macos" ]] && [[ "$OS" != "ios" ]] && [[ "$OS" != "macostest" ]]; then if [[ "$OS" != "macos" ]] && [[ "$OS" != "ios" ]] && [[ "$OS" != "macostest" ]]; then
@ -108,7 +108,7 @@ if [[ "$OS" == "ios" ]]; then
fi fi
if ! [ -d "ios" ] || ! [ -d "macos" ]; then if ! [ -d "ios" ] || ! [ -d "macos" ]; then
die "This script must be executed at the root of the repository." killProcess "This script must be executed at the root of the repository."
fi fi
QMAKE=qmake QMAKE=qmake
@ -120,7 +120,7 @@ elif [ "$OS" = "ios" ] && ! [ "$QT_IOS_BIN" = "" ]; then
QMAKE=$QT_IOS_BIN/qmake QMAKE=$QT_IOS_BIN/qmake
fi fi
$QMAKE -v &>/dev/null || die "qmake doesn't exist or it fails" $QMAKE -v &>/dev/null || killProcess "qmake doesn't exist or it fails"
print Y "Retrieve the wireguard-go version... " print Y "Retrieve the wireguard-go version... "
if [ "$OS" = "macos" ]; then if [ "$OS" = "macos" ]; then
@ -138,7 +138,7 @@ fi
print G "done." print G "done."
printn Y "Cleaning the existing project... " printn Y "Cleaning the existing project... "
rm -rf AmneziaVPN.xcodeproj/ || die "Failed to remove things" rm -rf AmneziaVPN.xcodeproj/ || killProcess "Failed to remove things"
print G "done." print G "done."
printn Y "Extract the project version... " printn Y "Extract the project version... "
@ -189,7 +189,7 @@ elif [ "$OS" = "ios" ]; then
ADJUST="CONFIG+=adjust" ADJUST="CONFIG+=adjust"
fi fi
else else
die "Why are we here?" killProcess "Why are we here?"
fi fi
VPNMODE= VPNMODE=
@ -259,10 +259,10 @@ $QMAKE \
$WEMODE \ $WEMODE \
$PLATFORM \ $PLATFORM \
$ADJUST \ $ADJUST \
./client.pro || die "Compilation failed" ./client.pro || killProcess "Compilation failed"
print Y "Patching the xcode project..." print Y "Patching the xcode project..."
ruby scripts/xcode_patcher.rb "AmneziaVPN.xcodeproj" "$SHORTVERSION" "$FULLVERSION" "$OSRUBY" "$NETWORKEXTENSION" "$ADJUST_SDK_TOKEN" || die "Failed to merge xcode with wireguard" ruby scripts/xcode_patcher.rb "AmneziaVPN.xcodeproj" "$SHORTVERSION" "$FULLVERSION" "$OSRUBY" "$NETWORKEXTENSION" "$ADJUST_SDK_TOKEN" || killProcess "Failed to merge xcode with wireguard"
print G "done." print G "done."
if command -v "sed" &>/dev/null; then if command -v "sed" &>/dev/null; then