fix bash errors

This commit is contained in:
nikk gitanes
2021-12-24 11:59:19 +03:00
parent d0c8bde142
commit 2b62163768

View File

@@ -50,7 +50,7 @@ OUTPUT="${ROOT}/dist/TorrServer"
#### Build web #### Build web
echo "Build web" echo "Build web"
$GOBIN run gen_web.go || exit 1 $GOBIN run gen_web.go
#### Build server #### Build server
echo "Build server" echo "Build server"
@@ -83,20 +83,22 @@ done
### Android build section ### Android build section
##### #####
declare -A COMPILERS=( declare -a COMPILERS=(
["arm7"]="armv7a-linux-androideabi21-clang" "arm7:armv7a-linux-androideabi21-clang"
["arm64"]="aarch64-linux-android21-clang" "arm64:aarch64-linux-android21-clang"
["386"]="i686-linux-android21-clang" "386:i686-linux-android21-clang"
["amd64"]="x86_64-linux-android21-clang" "amd64:x86_64-linux-android21-clang"
) )
export NDK_TOOLCHAIN=$ROOT/toolchain export NDK_TOOLCHAIN=$ROOT/toolchain
GOOS=android GOOS=android
for GOARCH in "${!COMPILERS[@]}"; do for V in "${COMPILERS[@]}"; do
export CC="$NDK_TOOLCHAIN/bin/${COMPILERS[$GOARCH]}" GOARCH=${V%:*}
export CXX="$NDK_TOOLCHAIN/bin/${COMPILERS[$GOARCH]}++" COMPILER=${V#*:}
export CC="$NDK_TOOLCHAIN/bin/$COMPILER"
export CXX="$NDK_TOOLCHAIN/bin/$COMPILER++"
set_goarm "$GOARCH" set_goarm "$GOARCH"
BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}" BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}"
CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} CGO_ENABLED=1 ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd" CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} CGO_ENABLED=1 ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd"