3wordchant
/
oasis
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add basedir check for macOS shell script 

Problem: When running the Darwin binary from another directory, the
script would look in the user's current working directory for both
`node` and `src`, which is wrong.

Solution: Set `BASEDIR` and use it so that we use the correct paths.
This commit is contained in:
Christian Bundy 2020-02-26 07:32:56 -08:00
parent 6812347b02
commit 8ed77e5a64
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build.sh
View File

@ -3,11 +3,10 @@
set -ex
BASEDIR="$(dirname "$0")"
TARGET_VERSION="12.16.1"
cd "$BASEDIR/.."
TARGET_VERSION="12.16.1"
git clean -fdx
mkdir -p vendor
@ -51,12 +50,13 @@ rm -rf ./node_modules/sharp
# Darwin (shell script)
cat << EOF > oasis-darwin-x64
#!/bin/sh
exec vendor/node-v$TARGET_VERSION-darwin-x64/bin/node src "\$@"
BASEDIR="\$(dirname "\$0")"
exec "\$BASEDIR/vendor/node-v$TARGET_VERSION-darwin-x64/bin/node" "\$BASEDIR/src" "\$@"
EOF
chmod +x oasis-darwin-x64
# Linux (ELF executable)
clang scripts/oasis.c -Wall -g -no-pie -o "oasis-linux-x64" --target=x86_64-linux-unknown -D "NODE=\"vendor/node-v$TARGET_VERSION-linux-x64/bin/node\""
clang scripts/oasis.c -Wall -g -no-pie -o "oasis-linux-x64" --target=x86_64-linux -D "NODE=\"vendor/node-v$TARGET_VERSION-linux-x64/bin/node\""
chmod +x oasis-linux-x64
# Windows (batch file)
@ -72,7 +72,4 @@ ZIP_PATH="/tmp/oasis-x64.zip"
rm -f "$ZIP_PATH"
zip -r "$ZIP_PATH" . -x ".git/**"
rm -f oasis-darwin-x64
rm -f oasis-linux-x64
rm -f oasis-win-x64.bat
rm -rf vendor
git clean -fdx