diff --git a/ebook2audiobook.cmd b/ebook2audiobook.cmd index b8106eed..03f7e8a4 100755 --- a/ebook2audiobook.cmd +++ b/ebook2audiobook.cmd @@ -5,7 +5,7 @@ setlocal enabledelayedexpansion set "ARGS=%*" set "NATIVE=native" set "FULL_DOCKER=full_docker" -set "APP_MODE=%NATIVE%" +set "SCRIPT_MODE=%NATIVE%" set "APP_NAME=ebook2audiobook" set "SCRIPT_DIR=%~dp0" set "RUN_SCRIPT=ebook2audiobook.cmd" @@ -57,7 +57,7 @@ if "%ARCH%"=="x86" ( :: Check if running inside Docker if defined CONTAINER ( - set "APP_MODE=%FULL_DOCKER%" + set "SCRIPT_MODE=%FULL_DOCKER%" goto :main ) @@ -269,7 +269,6 @@ if not "%HEADLESS_FOUND%"=="%ARGS%" ( call :make_shortcut "%STARTMENU_LNK%" call :make_shortcut "%DESKTOP_LNK%" ) - echo [INFO] Launching browser listener in background... start "E2A" powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0.bh.ps1" ) exit /b @@ -293,8 +292,8 @@ goto :install_components exit /b :main -if "%APP_MODE%"=="%FULL_DOCKER%" ( - call python %SCRIPT_DIR%\app.py --script_mode %APP_MODE% %ARGS% +if "%SCRIPT_MODE%"=="%FULL_DOCKER%" ( + call python %SCRIPT_DIR%\app.py --script_mode %SCRIPT_MODE% %ARGS% ) else ( if not exist "%SCRIPT_DIR%\%PYTHON_ENV%" ( call conda create --prefix "%SCRIPT_DIR%\%PYTHON_ENV%" python=%PYTHON_VERSION% -y @@ -312,7 +311,7 @@ if "%APP_MODE%"=="%FULL_DOCKER%" ( call conda activate "%SCRIPT_DIR%\%PYTHON_ENV%" ) call :build_gui - call python "%SCRIPT_DIR%\app.py" --script_mode %APP_MODE% %ARGS% + call python "%SCRIPT_DIR%\app.py" --script_mode %SCRIPT_MODE% %ARGS% call conda deactivate ) exit /b diff --git a/ebook2audiobook.sh b/ebook2audiobook.sh index 0c799f78..35b84ead 100755 --- a/ebook2audiobook.sh +++ b/ebook2audiobook.sh @@ -48,10 +48,12 @@ done NATIVE="native" FULL_DOCKER="full_docker" SCRIPT_MODE="$NATIVE" +APP_NAME="ebook2audiobook" WGET=$(which wget 2>/dev/null) REQUIRED_PROGRAMS=("curl" "pkg-config" "calibre" "ffmpeg" "nodejs" "espeak-ng" "rust" "sox" "tesseract") PYTHON_ENV="python_env" CURRENT_ENV="" +INSTALLED_LOG="$SCRIPT_DIR/.installed" if [[ "$OSTYPE" != "linux"* && "$OSTYPE" != "darwin"* ]]; then echo "Error: OS $OSTYPE unsupported." @@ -196,6 +198,9 @@ else echo >> $HOME/.zprofile echo 'eval "$(/usr/local/bin/brew shellenv)"' >> $HOME/.zprofile eval "$(/usr/local/bin/brew shellenv)" + if ! grep -iqFx "homebrew" "$INSTALLED_LOG"; then + echo "homebrew" >> "$INSTALLED_LOG" + fi fi else SUDO="sudo" @@ -362,6 +367,9 @@ else source "$CONFIG_FILE" conda init "$shell_name" echo -e "\e[32m===============>>> conda is installed! <<===============\e[0m" + if ! grep -iqFx "Miniforge3" "$INSTALLED_LOG"; then + echo "Miniforge3" >> "$INSTALLED_LOG" + fi else echo -e "\e[31mconda installation failed.\e[0m" return 1 @@ -482,7 +490,6 @@ else } function mac_app { - local APP_NAME="ebook2audiobook" local APP_BUNDLE="$HOME/Applications/$APP_NAME.app" local CONTENTS="$APP_BUNDLE/Contents" local MACOS="$CONTENTS/MacOS"