diff --git a/assets/logo_high.png b/assets/logo_high.png index c493817..ad51cc0 100644 Binary files a/assets/logo_high.png and b/assets/logo_high.png differ diff --git a/assets/logo_low.png b/assets/logo_low.png index 24b8515..f95f126 100644 Binary files a/assets/logo_low.png and b/assets/logo_low.png differ diff --git a/clinica-app/client/public/images/logo_high.png b/clinica-app/client/public/images/logo_high.png index c493817..ad51cc0 100644 Binary files a/clinica-app/client/public/images/logo_high.png and b/clinica-app/client/public/images/logo_high.png differ diff --git a/clinica-app/client/public/images/logo_low.png b/clinica-app/client/public/images/logo_low.png index 24b8515..f95f126 100644 Binary files a/clinica-app/client/public/images/logo_low.png and b/clinica-app/client/public/images/logo_low.png differ diff --git a/deploy_to_local_server.bat b/deploy_to_local_server.bat index 1dd131a..c1577b3 100644 --- a/deploy_to_local_server.bat +++ b/deploy_to_local_server.bat @@ -3,6 +3,7 @@ setlocal set "DEPLOY_ROOT=C:\deploy\clinica_veterinaria_formiginese" set "APP_DIR=%DEPLOY_ROOT%\clinica-app" +set "DEPLOY_BRANCH=" echo === Deploy demo Clinica Veterinaria Formiginese === echo. @@ -19,13 +20,34 @@ if not exist "%APP_DIR%\" ( echo [1/3] Aggiornamento repository di deploy... pushd "%DEPLOY_ROOT%" || exit /b 1 -git pull -if errorlevel 1 ( + +for /f "delims=" %%i in ('git branch --show-current') do set "DEPLOY_BRANCH=%%i" + +if "%DEPLOY_BRANCH%"=="" ( echo. - echo ERRORE: git pull non riuscito. + echo ERRORE: impossibile determinare il branch corrente nella copia di deploy. popd exit /b 1 ) + +echo Branch deploy attivo: %DEPLOY_BRANCH% + +git fetch origin +if errorlevel 1 ( + echo. + echo ERRORE: git fetch non riuscito. + popd + exit /b 1 +) + +git reset --hard origin/%DEPLOY_BRANCH% +if errorlevel 1 ( + echo. + echo ERRORE: git reset del branch di deploy non riuscito. + popd + exit /b 1 +) + popd echo.