A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: docker setup scripts error out when trying to create directories that already exist and add localhost url to finish message
aminnausinbf7fa1ab7973
diff --git a/startDocker.bat b/startDocker.batindex b4bb5f68..f5cf7693 100644--- a/startDocker.bat+++ b/startDocker.bat@@ -102,26 +102,62 @@ if not exist .env ()echo.-:: Ensure data directory exists+:: Ensure data directories existsif not exist "data/media" (call :ColorText "[INFO]" Blueecho Missing 'data/media' directory. Creating it...echo.- mkdir "data"mkdir "data/media"+ if errorlevel 1 (+ call :ColorText "[ERROR]" Red+ echo Failed to create 'data/media' directory.+ pause+ goto :end+ )+ call :ColorText "[SUCCESS]" Green+ echo 'data/media' directory created.+) else (+ call :ColorText "[FOUND]" Green+ echo 'data/media' directory.+)+echo.++:: Ensure data directory exists+if not exist "data/avatars" (+ call :ColorText "[INFO]" Blue+ echo Missing 'data/avatars' directory. Creating it...+ echo.mkdir "data/avatars"+ if errorlevel 1 (+ call :ColorText "[ERROR]" Red+ echo Failed to create 'data/avatars' directory.+ pause+ goto :end+ )+ call :ColorText "[SUCCESS]" Green+ echo 'data/avatars' directory created.+) else (+ call :ColorText "[FOUND]" Green+ echo 'data/avatars' directory.+)+echo.++if not exist "data/thumbnails" (+ call :ColorText "[INFO]" Blue+ echo Missing 'data/thumbnails' directory. Creating it...+ echo.mkdir "data/thumbnails"if errorlevel 1 (call :ColorText "[ERROR]" Red- echo Failed to create 'data' directory.+ echo Failed to create 'data/thumbnails' directory.pausegoto :end)call :ColorText "[SUCCESS]" Green- echo 'data' directory created.+ echo 'data/thumbnails' directory created.) else (call :ColorText "[FOUND]" Green- echo 'data' directory.+ echo 'data/thumbnails' directory.)echo.@@ -149,7 +185,7 @@ if not exist "logs" (echo.:: Ensure caddy directory exists-if not exist "caddy/data" (+if not exist "caddy" (call :ColorText "[INFO]" Blueecho Missing 'caddy' directory. Creating it...echo.@@ -176,13 +212,26 @@ echo.setlocal ENABLEDELAYEDEXPANSIONSET "CURRENT_APP_HOST="+SET "CURRENT_APP_PORT="+SET "CURRENT_DOMAIN_DEFAULT=%FALLBACK_DEFAULT_DOMAIN%"+IF EXIST "%ENV_FILE%" (FOR /F "tokens=1* delims==" %%a IN ('findstr /b "APP_HOST=" "%ENV_FILE%"') DO (SET "CURRENT_APP_HOST=%%b")++ FOR /F "tokens=1* delims==" %%a IN ('findstr /b "APP_PORT=" "%ENV_FILE%"') DO (+ SET "CURRENT_APP_PORT=%%b"+ ))-SET "CURRENT_DOMAIN_DEFAULT=%FALLBACK_DEFAULT_DOMAIN%"+IF NOT "!CURRENT_APP_PORT!"=="" (+ REM Remove quotes+ SET "TEMP_PORT=!CURRENT_APP_PORT:"=!"+ IF NOT "!TEMP_PORT!"=="" (+ SET "CURRENT_APP_PORT=!TEMP_PORT!"+ )+)IF NOT "!CURRENT_APP_HOST!"=="" (REM Remove quotes@@ -191,7 +240,10 @@ IF NOT "!CURRENT_APP_HOST!"=="" (SET "CURRENT_DOMAIN_DEFAULT=!TEMP_DOMAIN_FROM_HOST!"))-ENDLOCAL & SET "CURRENT_DOMAIN_DEFAULT=%CURRENT_DOMAIN_DEFAULT%"+ENDLOCAL & (+ SET "CURRENT_DOMAIN_DEFAULT=%CURRENT_DOMAIN_DEFAULT%"+ SET "CURRENT_APP_PORT=%CURRENT_APP_PORT%"+)REM Ask for domain name, or use default in CI/CD modeIF "%IS_CI_MODE%"=="true" (@@ -214,6 +266,13 @@ IF "%USER_DOMAIN%"=="" (SET "APP_HOST=%USER_DOMAIN%")+REM Use default port if found port is empty+IF "%CURRENT_APP_PORT%"=="" (+ SET "APP_PORT=8080"+) ELSE (+ SET "APP_PORT=%CURRENT_APP_PORT%"+)+call :ColorText "[INFO] " BLUEecho Setting APP_HOST to: %APP_HOST%echo.@@ -405,7 +464,7 @@ echo ============================================echo SETUP COMPLETED SUCCESSFULLY!echo ============================================echo.-echo Your mediaServer will be available at https://%APP_HOST%+echo Your mediaServer will be available at https://%APP_HOST% or http://127.0.0.1:%APP_PORT%echo.echo To add audio or video to your server, put the files in ./data/media organised by /LIBRARY/FOLDER/VIDEO.mp4diff --git a/startDocker.sh b/startDocker.shindex 874f2d41..407485a6 100644--- a/startDocker.sh+++ b/startDocker.sh@@ -92,22 +92,20 @@ elsefiecho-# Ensure data directory exists-if [ ! -d "data/media" ]; then- echo -e "${BLUE}[INFO]${RESET} Missing 'data/media' directory. Creating it..."+# Ensure data subdirectories exists+if [ ! -d "data/media" ] || [ ! -d "data/avatars" ] || [ ! -d "data/thumbnails" ]; then+ echo -e "${BLUE}[INFO]${RESET} One or more 'data' subdirectories are missing. Creating them..."echo- mkdir -p "data/media"- mkdir -p "data/avatars"- mkdir -p "data/thumbnails"+ mkdir -p "data/media" "data/avatars" "data/thumbnails"sudo chown -R 9999:9999 ./data/*sudo chmod -R 775 dataif [ $? -ne 0 ]; then- echo -e "${RED}[ERROR]${RESET} Failed to create 'data' directory."+ echo -e "${RED}[ERROR]${RESET} Failed to create 'data' subdirectories or set permissions."exit 1fi- echo -e "${GREEN}[SUCCESS]${RESET} 'data' directory created."+ echo -e "${GREEN}[SUCCESS]${RESET} 'data' subdirectories created."else- echo -e "${GREEN}[FOUND]${RESET} 'data' directory."+ echo -e "${GREEN}[FOUND]${RESET} 'data' subdirectories."fiecho@@ -151,10 +149,12 @@ echoecho -e "${YELLOW}[STEP 2/6]${RESET} Setting up user config..."echo-# Get existing APP_HOST or use default+# Get existing APP_HOST and APP_PORT or use defaultsCURRENT_APP_HOST=""+CURRENT_APP_PORT=""if [ -f "$ENV_FILE" ]; thenCURRENT_APP_HOST=$(grep "^APP_HOST=" "$ENV_FILE" | sed -E 's/^APP_HOST="?([^"]*)"?/\1/')+ CURRENT_APP_PORT=$(grep "^APP_PORT=" "$ENV_FILE" | sed -E 's/^APP_PORT="?([^"]*)"?/\1/')fiCURRENT_DOMAIN_DEFAULT="${FALLBACK_DEFAULT_DOMAIN}"@@ -176,6 +176,7 @@ elsefiAPP_HOST="${USER_DOMAIN:-$CURRENT_DOMAIN_DEFAULT}" # Use current default if user input is empty+APP_PORT="${CURRENT_APP_PORT:-8080}" # Use current default if user input is emptyecho -e "${BLUE}[INFO]${RESET} Setting APP_HOST to: ${APP_HOST}"echo@@ -286,6 +287,6 @@ echo "============================================"echo -e "${GREEN} SETUP COMPLETED SUCCESSFULLY!${RESET}"echo "============================================"echo-echo "Your mediaServer will be available at https://$APP_HOST"+echo "Your mediaServer will be available at https://$APP_HOST or http://127.0.0.1:$APP_PORT"echoecho "To add audio or video to your server, put the files in ./data/media organised by /LIBRARY/FOLDER/VIDEO.mp4"