From 27c29c185a6228987a36c7ce35e7334849af96cd Mon Sep 17 00:00:00 2001 From: partisan Date: Wed, 8 Jan 2025 00:29:21 +0100 Subject: [PATCH] removed 'build mode' from run scripts --- run.bat | 45 ++++++++++++++++++++------------------------- run.sh | 44 ++++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/run.bat b/run.bat index 26b37f6..f57ddcf 100755 --- a/run.bat +++ b/run.bat @@ -5,7 +5,6 @@ rem Initialize variables set SKIP_CONFIG="" set PORT="" set DOMAIN="" -set BUILD_MODE=false set BUILD_OUTPUT=qgato.exe rem Parse arguments @@ -28,11 +27,6 @@ if "%~1"=="--skip-config-check" ( shift goto parse_args ) -if "%~1"=="--build" ( - set BUILD_MODE=true - shift - goto parse_args -) echo Unknown argument: %~1 exit /b 1 @@ -50,27 +44,28 @@ for %%f in (*.go) do ( ) ) -if "%BUILD_MODE%"=="true" ( - rem Build mode - echo Building application... - go build -o "%BUILD_OUTPUT%" !GO_FILES! - if errorlevel 1 ( - echo Build failed! - exit /b 1 - ) - echo Build successful! Output: %CD%\%BUILD_OUTPUT% -) else ( - rem Construct the command - set CMD=go run !GO_FILES! !SKIP_CONFIG! - if not "%PORT%"=="" set CMD=!CMD! --port %PORT% - if not "%DOMAIN%"=="" set CMD=!CMD! --domain %DOMAIN% +rem Always delete and rebuild the binary +echo Cleaning previous build... +if exist "%BUILD_OUTPUT%" del "%BUILD_OUTPUT%" - rem Informative output - echo Starting application with command: !CMD! - - rem Run the Go program with the constructed command - call !CMD! +echo Building application... +go build -o "%BUILD_OUTPUT%" !GO_FILES! +if errorlevel 1 ( + echo Build failed! + exit /b 1 ) +echo Build successful! Output: %CD%\%BUILD_OUTPUT% + +rem Construct the command +set CMD=%BUILD_OUTPUT% !SKIP_CONFIG! +if not "%PORT%"=="" set CMD=!CMD! --port %PORT% +if not "%DOMAIN%"=="" set CMD=!CMD! --domain %DOMAIN% + +rem Informative output +echo Starting application with command: !CMD! + +rem Run the built executable +call !CMD! rem Return to the original directory popd diff --git a/run.sh b/run.sh index c5fd207..400ebc9 100755 --- a/run.sh +++ b/run.sh @@ -4,7 +4,6 @@ SKIP_CONFIG="" PORT="" DOMAIN="" -BUILD_MODE=false BUILD_OUTPUT="qgato" # Parse arguments @@ -22,10 +21,6 @@ while [ $# -gt 0 ]; do SKIP_CONFIG="--skip-config-check" shift ;; - --build) - BUILD_MODE=true - shift - ;; *) echo "Unknown argument: $1" exit 1 @@ -39,24 +34,25 @@ SCRIPT_DIR=$(dirname "$0") # List all Go files in the script directory (excluding test files) GO_FILES=$(find "$SCRIPT_DIR" -name '*.go' ! -name '*_test.go' -print) -if $BUILD_MODE; then - # Build mode - echo "Building application..." - go build -o "$SCRIPT_DIR/$BUILD_OUTPUT" $GO_FILES - if [ $? -eq 0 ]; then - echo "Build successful! Output: $SCRIPT_DIR/$BUILD_OUTPUT" - else - echo "Build failed!" - exit 1 - fi +# Always delete and rebuild the binary +echo "Cleaning previous build..." +rm -f "$SCRIPT_DIR/$BUILD_OUTPUT" + +echo "Building application..." +go build -o "$SCRIPT_DIR/$BUILD_OUTPUT" $GO_FILES +if [ $? -eq 0 ]; then + echo "Build successful! Output: $SCRIPT_DIR/$BUILD_OUTPUT" else - # Run mode - CMD="go run $GO_FILES $SKIP_CONFIG" - [ -n "$PORT" ] && CMD="$CMD --port $PORT" - [ -n "$DOMAIN" ] && CMD="$CMD --domain $DOMAIN" - - echo "Starting application with command: $CMD" - - # Run the Go program with the constructed command - eval $CMD + echo "Build failed!" + exit 1 fi + +# Construct the run command +CMD="$SCRIPT_DIR/$BUILD_OUTPUT $SKIP_CONFIG" +[ -n "$PORT" ] && CMD="$CMD --port $PORT" +[ -n "$DOMAIN" ] && CMD="$CMD --domain $DOMAIN" + +echo "Starting application with command: $CMD" + +# Run the built executable +eval $CMD