mirror of
https://github.com/JustArchiNET/ArchiSteamFarm.git
synced 2025-12-15 22:10:30 +00:00
Modify cc.sh and run.sh for plugin scenario
This commit is contained in:
19
cc.sh
19
cc.sh
@@ -4,19 +4,23 @@ set -eu
|
||||
TARGET_FRAMEWORK="netcoreapp3.1"
|
||||
|
||||
MAIN_PROJECT="ArchiSteamFarm"
|
||||
STEAM_TOKEN_DUMPER_NAME="${MAIN_PROJECT}.OfficialPlugins.SteamTokenDumper"
|
||||
TESTS_PROJECT="${MAIN_PROJECT}.Tests"
|
||||
SOLUTION="${MAIN_PROJECT}.sln"
|
||||
CONFIGURATION="Release"
|
||||
OUT="out"
|
||||
OUT_ASF="${OUT}/result"
|
||||
OUT_STD="${OUT}/${STEAM_TOKEN_DUMPER_NAME}"
|
||||
|
||||
ASF_UI=1
|
||||
CLEAN=0
|
||||
PULL=1
|
||||
SHARED_COMPILATION=1
|
||||
STEAM_TOKEN_DUMPER=1
|
||||
TEST=1
|
||||
|
||||
PRINT_USAGE() {
|
||||
echo "Usage: $0 [--clean] [--no-asf-ui] [--no-pull] [--no-shared-compilation] [--no-test] [debug/release]"
|
||||
echo "Usage: $0 [--clean] [--no-asf-ui] [--no-pull] [--no-shared-compilation] [--no-steam-token-dumper] [--no-test] [debug/release]"
|
||||
}
|
||||
|
||||
cd "$(dirname "$(readlink -f "$0")")"
|
||||
@@ -33,6 +37,8 @@ for ARG in "$@"; do
|
||||
--no-pull) PULL=0 ;;
|
||||
--shared-compilation) SHARED_COMPILATION=1 ;;
|
||||
--no-shared-compilation) SHARED_COMPILATION=0 ;;
|
||||
--steam-token-dumper) STEAM_TOKEN_DUMPER=1 ;;
|
||||
--no-steam-token-dumper) STEAM_TOKEN_DUMPER=0 ;;
|
||||
--test) TEST=1 ;;
|
||||
--no-test) TEST=0 ;;
|
||||
--help) PRINT_USAGE; exit 0 ;;
|
||||
@@ -88,7 +94,7 @@ if [ "$ASF_UI" -eq 1 ]; then
|
||||
npm run-script deploy --no-progress --prefix ASF-ui
|
||||
|
||||
# ASF's output www folder needs cleaning as well
|
||||
rm -rf "${OUT}/www"
|
||||
rm -rf "${OUT_ASF}/www"
|
||||
else
|
||||
echo "WARNING: ASF-ui dependencies are missing, skipping build of ASF-ui..."
|
||||
fi
|
||||
@@ -109,7 +115,14 @@ if [ "$TEST" -eq 1 ]; then
|
||||
dotnet test "$TESTS_PROJECT" $DOTNET_FLAGS
|
||||
fi
|
||||
|
||||
dotnet publish "$MAIN_PROJECT" -o "$OUT" $DOTNET_FLAGS
|
||||
dotnet publish "$MAIN_PROJECT" -o "$OUT_ASF" $DOTNET_FLAGS
|
||||
|
||||
if [ "$STEAM_TOKEN_DUMPER" -eq 1 ]; then
|
||||
dotnet publish "$STEAM_TOKEN_DUMPER_NAME" -o "$OUT_STD" $DOTNET_FLAGS
|
||||
|
||||
mkdir -p "${OUT_ASF}/plugins/${STEAM_TOKEN_DUMPER_NAME}"
|
||||
cp "${OUT_STD}/${STEAM_TOKEN_DUMPER_NAME}.dll" "${OUT_ASF}/plugins/${STEAM_TOKEN_DUMPER_NAME}"
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "SUCCESS: Compilation finished successfully! :)"
|
||||
|
||||
18
run.sh
18
run.sh
@@ -1,20 +1,20 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
BINARY_PATH="$(dirname "$(readlink -f "$0")")/out"
|
||||
BINARY_DIR="$(dirname "$(readlink -f "$0")")/out/result"
|
||||
CONFIG_PATH="config/ASF.json"
|
||||
|
||||
if [ ! -d "$BINARY_PATH" ]; then
|
||||
echo "ERROR: $BINARY_PATH could not be found!"
|
||||
if [ ! -d "$BINARY_DIR" ]; then
|
||||
echo "ERROR: $BINARY_DIR could not be found!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$BINARY_PATH"
|
||||
cd "$BINARY_DIR"
|
||||
|
||||
BINARY="$(pwd)/ArchiSteamFarm.dll"
|
||||
BINARY_PATH="$(pwd)/ArchiSteamFarm.dll"
|
||||
|
||||
if [ ! -f "$BINARY" ]; then
|
||||
echo "ERROR: $BINARY could not be found!"
|
||||
if [ ! -f "$BINARY_PATH" ]; then
|
||||
echo "ERROR: $BINARY_PATH could not be found!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -74,9 +74,9 @@ dotnet --info
|
||||
|
||||
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 "$BINARY_PATH" $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 "$BINARY_PATH" $BINARY_ARGS # Start ASF in the foreground, trap won't work until process exit
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user