Add support of ASF_PATH to shell scripts + misc

This commit is contained in:
JustArchi
2019-08-03 02:16:16 +02:00
parent 3ce215417b
commit 36b2a4b505
6 changed files with 84 additions and 15 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

9
cc.sh
View File

@@ -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 ..
)
# 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! :)"

4
run.sh
View File

@@ -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