diff --git a/cc.sh b/cc.sh index cb459c6c8..3994e2dfb 100755 --- a/cc.sh +++ b/cc.sh @@ -23,7 +23,18 @@ PRINT_USAGE() { echo "Usage: $0 [--clean] [--no-analysis] [--no-asf-ui] [--no-pull] [--no-shared-compilation] [--no-test] [debug/release]" } -cd "$(dirname "$(readlink -f "$0")")" +OS_TYPE="$(uname -s)" + +case "$OS_TYPE" in + "Darwin") SCRIPT_PATH="$(readlink "$0")" ;; + "FreeBSD") SCRIPT_PATH="$(readlink -f "$0")" ;; + "Linux") SCRIPT_PATH="$(readlink -f "$0")" ;; + *) echo "ERROR: Unknown OS type: ${OS_TYPE}. If you believe that our script should work on your machine, please let us know."; exit 1 +esac + +SCRIPT_DIR="$(dirname "$SCRIPT_PATH")" + +cd "$SCRIPT_DIR" for ARG in "$@"; do case "$ARG" in @@ -64,13 +75,11 @@ if [ ! -f "$SOLUTION" ]; then exit 1 fi -os_type="$(uname -s)" - -case "$os_type" in +case "$OS_TYPE" in "Darwin") os_type="osx" ;; "FreeBSD") os_type="freebsd" ;; "Linux") os_type="linux" ;; - *) echo "ERROR: Unknown OS type: ${os_type}. If you believe that our script should work on your machine, please let us know."; exit 1 + *) echo "ERROR: Unknown OS type: ${OS_TYPE}. If you believe that our script should work on your machine, please let us know."; exit 1 esac cpu_architecture="$(uname -m)" diff --git a/run.sh b/run.sh index 871a4d9fe..16dc416ef 100755 --- a/run.sh +++ b/run.sh @@ -1,23 +1,32 @@ #!/usr/bin/env sh set -eu -BINARY_DIR="$(dirname "$(readlink -f "$0")")/out/result" CONFIG_PATH="config/ASF.json" +OS_TYPE="$(uname -s)" + +case "$OS_TYPE" in + "Darwin") SCRIPT_PATH="$(readlink "$0")" ;; + "FreeBSD") SCRIPT_PATH="$(readlink -f "$0")" ;; + "Linux") SCRIPT_PATH="$(readlink -f "$0")" ;; + *) echo "ERROR: Unknown OS type: ${OS_TYPE}. If you believe that our script should work on your machine, please let us know."; exit 1 +esac + +SCRIPT_DIR="$(dirname "$SCRIPT_PATH")" +BINARY_DIR="${SCRIPT_DIR}/out/result" +BINARY="${BINARY_DIR}/ArchiSteamFarm.dll" if [ ! -d "$BINARY_DIR" ]; then echo "ERROR: $BINARY_DIR could not be found!" exit 1 fi -cd "$BINARY_DIR" - -BINARY_PATH="$(pwd)/ArchiSteamFarm.dll" - -if [ ! -f "$BINARY_PATH" ]; then - echo "ERROR: $BINARY_PATH could not be found!" +if [ ! -f "$BINARY" ]; then + echo "ERROR: $BINARY could not be found!" exit 1 fi +cd "$BINARY_DIR" + BINARY_ARGS="" PATH_NEXT=0