diff --git a/contrib/msysgit-install.cmd b/contrib/msysgit-install.cmd index 5f005bfa7..0108d138d 100644 --- a/contrib/msysgit-install.cmd +++ b/contrib/msysgit-install.cmd @@ -20,7 +20,7 @@ call :ChkGetopt getopt.exe || set ERR=1 if %ERR%==1 goto :End echo getopt.exe... Found -if not exist "%GIT_HOME%\bin\git-flow" goto :Install +if not exist "%GIT_HOME%\bin\git-hf" goto :Install echo GitFlow is already installed.>&2 set /p mychoice="Do you want to replace it [y/n]" if "%mychoice%"=="y" goto :DeleteOldFiles @@ -28,17 +28,17 @@ goto :Abort :DeleteOldFiles echo Deleting old files... -for /F %%i in ("%GIT_HOME%\git-flow*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi" +for /F %%i in ("%GIT_HOME%\git-hf*" "%GIT_HOME%\gitflow-*") do if exist "%%~fi" del /F /Q "%%~fi" :Install echo Copying files... ::goto :EOF -xcopy "%~dp0\..\git-flow" "%GIT_HOME%\bin" /Y /R /F +xcopy "%~dp0\..\git-hf" "%GIT_HOME%\bin" /Y /R /F if errorlevel 4 if not errorlevel 5 goto :AccessDenied if errorlevel 1 set ERR=1 -xcopy "%~dp0\..\git-flow*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1 -xcopy "%~dp0\..\gitflow-*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1 -xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\gitflow-shFlags" /Y /R /F || set ERR=1 +xcopy "%~dp0\..\git-hf*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1 +xcopy "%~dp0\..\hubflow-*" "%GIT_HOME%\bin" /Y /R /F || set ERR=1 +xcopy "%~dp0\..\shFlags\src\shflags" "%GIT_HOME%\bin\hubflow-shFlags" /Y /R /F || set ERR=1 if %ERR%==1 choice /T 30 /C Y /D Y /M "Some unexpected errors happened. Sorry, you'll have to fix them by yourself."