From 36b2a4b5053a72717c4cbcd40aeaf20728613eb1 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 3 Aug 2019 02:16:16 +0200 Subject: [PATCH] Add support of ASF_PATH to shell scripts + misc --- .../generic-netf/ArchiSteamFarm-Service.sh | 20 +++++++++++++++++-- .../overlay/generic-netf/ArchiSteamFarm.sh | 20 +++++++++++++++++-- .../overlay/generic/ArchiSteamFarm-Service.sh | 20 +++++++++++++++++-- .../overlay/generic/ArchiSteamFarm.sh | 20 +++++++++++++++++-- cc.sh | 15 +++++++------- run.sh | 4 ++++ 6 files changed, 84 insertions(+), 15 deletions(-) diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh index 6765f2ab5..af3714b27 100755 --- a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh +++ b/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh @@ -9,8 +9,13 @@ SCRIPT_DIR="$(pwd)" SCRIPT_PATH="${SCRIPT_DIR}/${0}" BINARY="${SCRIPT_DIR}/ArchiSteamFarm.exe" -BINARY_ARGS=() +if [[ ! -f "$BINARY" ]]; then + echo "ERROR: $BINARY could not be found!" + exit 1 +fi + +BINARY_ARGS=() PATH_NEXT=0 PARSE_ARG() { @@ -18,7 +23,14 @@ PARSE_ARG() { case "$1" in --path) PATH_NEXT=1 ;; - --path=*) cd "$(echo "$1" | cut -d '=' -f 2-)" ;; + --path=*) + if [[ "$PATH_NEXT" -eq 1 ]]; then + PATH_NEXT=0 + cd "$1" + else + cd "$(echo "$1" | cut -d '=' -f 2-)" + fi + ;; *) if [[ "$PATH_NEXT" -eq 1 ]]; then PATH_NEXT=0 @@ -27,6 +39,10 @@ PARSE_ARG() { esac } +if [[ -n "${ASF_PATH-}" ]]; then + cd "$ASF_PATH" +fi + if [[ -n "${ASF_ARGS-}" ]]; then for ARG in $ASF_ARGS; do if [[ -n "$ARG" ]]; then diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh index cb7e55ab3..825150026 100755 --- a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh +++ b/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh @@ -9,8 +9,13 @@ SCRIPT_DIR="$(pwd)" SCRIPT_PATH="${SCRIPT_DIR}/${0}" BINARY="${SCRIPT_DIR}/ArchiSteamFarm.exe" -BINARY_ARGS=() +if [[ ! -f "$BINARY" ]]; then + echo "ERROR: $BINARY could not be found!" + exit 1 +fi + +BINARY_ARGS=() PATH_NEXT=0 PARSE_ARG() { @@ -18,7 +23,14 @@ PARSE_ARG() { case "$1" in --path) PATH_NEXT=1 ;; - --path=*) cd "$(echo "$1" | cut -d '=' -f 2-)" ;; + --path=*) + if [[ "$PATH_NEXT" -eq 1 ]]; then + PATH_NEXT=0 + cd "$1" + else + cd "$(echo "$1" | cut -d '=' -f 2-)" + fi + ;; *) if [[ "$PATH_NEXT" -eq 1 ]]; then PATH_NEXT=0 @@ -27,6 +39,10 @@ PARSE_ARG() { esac } +if [[ -n "${ASF_PATH-}" ]]; then + cd "$ASF_PATH" +fi + if [[ -n "${ASF_ARGS-}" ]]; then for ARG in $ASF_ARGS; do if [[ -n "$ARG" ]]; then diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh index b77c68e18..349c63af1 100755 --- a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh +++ b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh @@ -9,8 +9,13 @@ SCRIPT_DIR="$(pwd)" SCRIPT_PATH="${SCRIPT_DIR}/${0}" BINARY="${SCRIPT_DIR}/ArchiSteamFarm.dll" -BINARY_ARGS=() +if [[ ! -f "$BINARY" ]]; then + echo "ERROR: $BINARY could not be found!" + exit 1 +fi + +BINARY_ARGS=() PATH_NEXT=0 PARSE_ARG() { @@ -18,7 +23,14 @@ PARSE_ARG() { case "$1" in --path) PATH_NEXT=1 ;; - --path=*) cd "$(echo "$1" | cut -d '=' -f 2-)" ;; + --path=*) + if [[ "$PATH_NEXT" -eq 1 ]]; then + PATH_NEXT=0 + cd "$1" + else + cd "$(echo "$1" | cut -d '=' -f 2-)" + fi + ;; *) if [[ "$PATH_NEXT" -eq 1 ]]; then PATH_NEXT=0 @@ -27,6 +39,10 @@ PARSE_ARG() { esac } +if [[ -n "${ASF_PATH-}" ]]; then + cd "$ASF_PATH" +fi + if [[ -n "${ASF_ARGS-}" ]]; then for ARG in $ASF_ARGS; do if [[ -n "$ARG" ]]; then diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh index 5f7359114..15f8a337e 100755 --- a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh +++ b/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh @@ -9,8 +9,13 @@ SCRIPT_DIR="$(pwd)" SCRIPT_PATH="${SCRIPT_DIR}/${0}" BINARY="${SCRIPT_DIR}/ArchiSteamFarm.dll" -BINARY_ARGS=() +if [[ ! -f "$BINARY" ]]; then + echo "ERROR: $BINARY could not be found!" + exit 1 +fi + +BINARY_ARGS=() PATH_NEXT=0 PARSE_ARG() { @@ -18,7 +23,14 @@ PARSE_ARG() { case "$1" in --path) PATH_NEXT=1 ;; - --path=*) cd "$(echo "$1" | cut -d '=' -f 2-)" ;; + --path=*) + if [[ "$PATH_NEXT" -eq 1 ]]; then + PATH_NEXT=0 + cd "$1" + else + cd "$(echo "$1" | cut -d '=' -f 2-)" + fi + ;; *) if [[ "$PATH_NEXT" -eq 1 ]]; then PATH_NEXT=0 @@ -27,6 +39,10 @@ PARSE_ARG() { esac } +if [[ -n "${ASF_PATH-}" ]]; then + cd "$ASF_PATH" +fi + if [[ -n "${ASF_ARGS-}" ]]; then for ARG in $ASF_ARGS; do if [[ -n "$ARG" ]]; then diff --git a/cc.sh b/cc.sh index 8f565a426..5dd1f62f8 100755 --- a/cc.sh +++ b/cc.sh @@ -63,20 +63,21 @@ fi if [[ "$ASF_UI" -eq 1 ]]; then if [[ -f "ASF-ui/package.json" ]] && hash npm 2>/dev/null; then - echo "Building ASF UI..." + echo "Building ASF-ui..." # ASF-ui doesn't clean itself after old build rm -rf "ASF-ui/dist" - cd ASF-ui - npm ci - npm run-script deploy - cd .. + ( + cd ASF-ui + npm ci + npm run-script deploy + ) # ASF's output www folder needs cleaning as well rm -rf "${MAIN_PROJECT}/${OUT}/www" else - echo "WARNING: ASF UI dependencies are missing, skipping build of ASF UI..." + echo "WARNING: ASF-ui dependencies are missing, skipping build of ASF-ui..." fi fi @@ -102,4 +103,4 @@ fi dotnet publish "$MAIN_PROJECT" "${DOTNET_FLAGS[@]}" echo -echo "Compilation finished successfully! :)" +echo "SUCCESS: Compilation finished successfully! :)" diff --git a/run.sh b/run.sh index 523fabe09..ed65da380 100755 --- a/run.sh +++ b/run.sh @@ -42,6 +42,10 @@ PARSE_ARG() { esac } +if [[ -n "${ASF_PATH-}" ]]; then + cd "$ASF_PATH" +fi + if [[ -n "${ASF_ARGS-}" ]]; then for ARG in $ASF_ARGS; do if [[ -n "$ARG" ]]; then