Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-16 08:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite ASF scripts to POSIX sh

Browse Source
This commit is contained in:
JustArchi
2019-11-07 22:02:59 +01:00
parent 2605df8ac5
commit 633146a3f9
6 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
#!/usr/bin/env sh
set -eu
CONFIG_PATH="config/ASF.json"
@@ -10,21 +10,21 @@ SCRIPT_PATH="${SCRIPT_DIR}/${0}"
BINARY="${SCRIPT_DIR}/ArchiSteamFarm.exe"
if [[ ! -f "$BINARY" ]]; then
if [ ! -f "$BINARY" ]; then
echo "ERROR: $BINARY could not be found!"
exit 1
fi
BINARY_ARGS=()
BINARY_ARGS=""
PATH_NEXT=0
PARSE_ARG() {
BINARY_ARGS+=("$1")
BINARY_ARGS="$BINARY_ARGS $1"
case "$1" in
--path) PATH_NEXT=1 ;;
--path=*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
else
@@ -32,27 +32,27 @@ PARSE_ARG() {
fi
;;
*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
fi
esac
}
if [[ -n "${ASF_PATH-}" ]]; then
if [ -n "${ASF_PATH-}" ]; then
cd "$ASF_PATH"
fi
if [[ -n "${ASF_ARGS-}" ]]; then
if [ -n "${ASF_ARGS-}" ]; then
for ARG in $ASF_ARGS; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
fi
for ARG in "$@"; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
@@ -60,9 +60,9 @@ done
CONFIG_PATH="$(pwd)/${CONFIG_PATH}"
# Kill underlying ASF process on shell process exit
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
trap "trap - TERM && kill -- -$$" INT TERM
if ! hash mono 2>/dev/null; then
if ! command -v mono >/dev/null; then
echo "ERROR: mono is not installed!"
exit 1
fi
@@ -70,13 +70,13 @@ fi
mono --version
while :; do
if [[ -f "$CONFIG_PATH" ]] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
if [ -f "$CONFIG_PATH" ] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
# We're running ASF in headless mode so we don't need STDIN
mono "${MONO_ARGS[@]-}" "$BINARY" "${BINARY_ARGS[@]-}" & # Start ASF in the background, trap will work properly due to non-blocking call
mono ${MONO_ARGS-} "$BINARY" $BINARY_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
wait $! # This will forward mono error code, set -e will abort the script if it's non-zero
else
# We're running ASF in non-headless mode, so we need STDIN to be operative
mono "${MONO_ARGS[@]-}" "$BINARY" "${BINARY_ARGS[@]-}" # Start ASF in the foreground, trap sadly won't work until process exit
mono ${MONO_ARGS-} "$BINARY" $BINARY_ARGS # Start ASF in the foreground, trap sadly won't work until process exit
fi
chmod +x "$SCRIPT_PATH" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update

32
ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
#!/usr/bin/env sh
set -eu
CONFIG_PATH="config/ASF.json"
@@ -10,21 +10,21 @@ SCRIPT_PATH="${SCRIPT_DIR}/${0}"
BINARY="${SCRIPT_DIR}/ArchiSteamFarm.exe"
if [[ ! -f "$BINARY" ]]; then
if [ ! -f "$BINARY" ]; then
echo "ERROR: $BINARY could not be found!"
exit 1
fi
BINARY_ARGS=()
BINARY_ARGS=""
PATH_NEXT=0
PARSE_ARG() {
BINARY_ARGS+=("$1")
BINARY_ARGS="$BINARY_ARGS $1"
case "$1" in
--path) PATH_NEXT=1 ;;
--path=*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
else
@@ -32,27 +32,27 @@ PARSE_ARG() {
fi
;;
*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
fi
esac
}
if [[ -n "${ASF_PATH-}" ]]; then
if [ -n "${ASF_PATH-}" ]; then
cd "$ASF_PATH"
fi
if [[ -n "${ASF_ARGS-}" ]]; then
if [ -n "${ASF_ARGS-}" ]; then
for ARG in $ASF_ARGS; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
fi
for ARG in "$@"; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
@@ -60,22 +60,22 @@ done
CONFIG_PATH="$(pwd)/${CONFIG_PATH}"
# Kill underlying ASF process on shell process exit
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
trap "trap - TERM && kill -- -$$" INT TERM
if ! hash mono 2>/dev/null; then
if ! command -v mono >/dev/null; then
echo "ERROR: mono is not installed!"
exit 1
fi
mono --version
if [[ -f "$CONFIG_PATH" ]] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
if [ -f "$CONFIG_PATH" ] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
# We're running ASF in headless mode so we don't need STDIN
mono "${MONO_ARGS[@]-}" "$BINARY" "${BINARY_ARGS[@]-}" & # Start ASF in the background, trap will work properly due to non-blocking call
mono ${MONO_ARGS-} "$BINARY" $BINARY_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
wait $! # This will forward mono error code, set -e will abort the script if it's non-zero
else
# We're running ASF in non-headless mode, so we need STDIN to be operative
mono "${MONO_ARGS[@]-}" "$BINARY" "${BINARY_ARGS[@]-}" # Start ASF in the foreground, trap won't work until process exit
mono ${MONO_ARGS-} "$BINARY" $BINARY_ARGS # Start ASF in the foreground, trap won't work until process exit
fi
chmod +x "$SCRIPT_PATH" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update

32
ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
#!/usr/bin/env sh
set -eu
CONFIG_PATH="config/ASF.json"
@@ -10,21 +10,21 @@ SCRIPT_PATH="${SCRIPT_DIR}/${0}"
BINARY="${SCRIPT_DIR}/ArchiSteamFarm.dll"
if [[ ! -f "$BINARY" ]]; then
if [ ! -f "$BINARY" ]; then
echo "ERROR: $BINARY could not be found!"
exit 1
fi
BINARY_ARGS=()
BINARY_ARGS=""
PATH_NEXT=0
PARSE_ARG() {
BINARY_ARGS+=("$1")
BINARY_ARGS="$BINARY_ARGS $1"
case "$1" in
--path) PATH_NEXT=1 ;;
--path=*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
else
@@ -32,27 +32,27 @@ PARSE_ARG() {
fi
;;
*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
fi
esac
}
if [[ -n "${ASF_PATH-}" ]]; then
if [ -n "${ASF_PATH-}" ]; then
cd "$ASF_PATH"
fi
if [[ -n "${ASF_ARGS-}" ]]; then
if [ -n "${ASF_ARGS-}" ]; then
for ARG in $ASF_ARGS; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
fi
for ARG in "$@"; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
@@ -60,9 +60,9 @@ done
CONFIG_PATH="$(pwd)/${CONFIG_PATH}"
# Kill underlying ASF process on shell process exit
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
trap "trap - TERM && kill -- -$$" INT TERM
if ! hash dotnet 2>/dev/null; then
if ! command -v dotnet >/dev/null; then
echo "ERROR: dotnet CLI tools are not installed!"
exit 1
fi
@@ -70,13 +70,13 @@ fi
dotnet --info
while :; do
if [[ -f "$CONFIG_PATH" ]] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
if [ -f "$CONFIG_PATH" ] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
# We're running ASF in headless mode so we don't need STDIN
dotnet "$BINARY" "${BINARY_ARGS[@]-}" & # Start ASF in the background, trap will work properly due to non-blocking call
dotnet ${DOTNET_ARGS-} "$BINARY" $BINARY_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero
else
# We're running ASF in non-headless mode, so we need STDIN to be operative
dotnet "$BINARY" "${BINARY_ARGS[@]-}" # Start ASF in the foreground, trap sadly won't work until process exit
dotnet ${DOTNET_ARGS-} "$BINARY" $BINARY_ARGS # Start ASF in the foreground, trap sadly won't work until process exit
fi
chmod +x "$SCRIPT_PATH" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update

32
ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
#!/usr/bin/env sh
set -eu
CONFIG_PATH="config/ASF.json"
@@ -10,21 +10,21 @@ SCRIPT_PATH="${SCRIPT_DIR}/${0}"
BINARY="${SCRIPT_DIR}/ArchiSteamFarm.dll"
if [[ ! -f "$BINARY" ]]; then
if [ ! -f "$BINARY" ]; then
echo "ERROR: $BINARY could not be found!"
exit 1
fi
BINARY_ARGS=()
BINARY_ARGS=""
PATH_NEXT=0
PARSE_ARG() {
BINARY_ARGS+=("$1")
BINARY_ARGS="$BINARY_ARGS $1"
case "$1" in
--path) PATH_NEXT=1 ;;
--path=*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
else
@@ -32,27 +32,27 @@ PARSE_ARG() {
fi
;;
*)
if [[ "$PATH_NEXT" -eq 1 ]]; then
if [ "$PATH_NEXT" -eq 1 ]; then
PATH_NEXT=0
cd "$1"
fi
esac
}
if [[ -n "${ASF_PATH-}" ]]; then
if [ -n "${ASF_PATH-}" ]; then
cd "$ASF_PATH"
fi
if [[ -n "${ASF_ARGS-}" ]]; then
if [ -n "${ASF_ARGS-}" ]; then
for ARG in $ASF_ARGS; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
fi
for ARG in "$@"; do
if [[ -n "$ARG" ]]; then
if [ -n "$ARG" ]; then
PARSE_ARG "$ARG"
fi
done
@@ -60,22 +60,22 @@ done
CONFIG_PATH="$(pwd)/${CONFIG_PATH}"
# Kill underlying ASF process on shell process exit
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
trap "trap - TERM && kill -- -$$" INT TERM
if ! hash dotnet 2>/dev/null; then
if ! command -v dotnet >/dev/null; then
echo "ERROR: dotnet CLI tools are not installed!"
exit 1
fi
dotnet --info
if [[ -f "$CONFIG_PATH" ]] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
if [ -f "$CONFIG_PATH" ] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
# We're running ASF in headless mode so we don't need STDIN
dotnet "$BINARY" "${BINARY_ARGS[@]-}" & # Start ASF in the background, trap will work properly due to non-blocking call
dotnet ${DOTNET_ARGS-} "$BINARY" $BINARY_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero
else
# We're running ASF in non-headless mode, so we need STDIN to be operative
dotnet "$BINARY" "${BINARY_ARGS[@]-}" # Start ASF in the foreground, trap won't work until process exit
dotnet ${DOTNET_ARGS-} "$BINARY" $BINARY_ARGS # Start ASF in the foreground, trap won't work until process exit
fi
chmod +x "$SCRIPT_PATH" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update