Merge pull request gitblit-org#1370 from Zwixx/master

This commit merges the pull request from Zwixx, with additional
changes via a separate Zwixx-fix-cmds branch.

Closes gitblit-org#1370

Author: flaix

src/main/distrib/win/add-indexed-branch.cmd

@@ -14,7 +14,11 @@
 @REM Set BRANCH ("default" or fully qualified ref - i.e. refs/heads/master)
 @REM Set EXCLUSIONS for any repositories that you do not want to change
 @REM --------------------------------------------------------------------------
+@SETLOCAL
 @SET FOLDER=data/git
 @SET EXCLUSIONS=--skip test.git --skip group/test*
 @SET BRANCH=default
+@PUSHD %~dp0
 @java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.AddIndexedBranch --repositoriesFolder %FOLDER% --branch %BRANCH% %EXCLUSIONS% %*
+@POPD
+@ENDLOCAL

src/main/distrib/win/authority.cmd

@@ -1 +1,8 @@
-@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.authority.GitblitAuthority --baseFolder data %*
+@SETLOCAL
+
+@SET gbhome=%~dp0
+@SET gbhome=%gbhome:~0,-1%
+
+@java -cp "%gbhome%\gitblit.jar";"%gbhome%\ext\*" com.gitblit.authority.GitblitAuthority --baseFolder "%gbhome%\data" %*
+
+@ENDLOCAL

src/main/distrib/win/gitblit-stop.cmd

@@ -1 +1 @@
-@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.GitBlitServer --stop --baseFolder data %*
+@java -cp "%~dp0gitblit.jar";"%~dp0ext\*" com.gitblit.GitBlitServer --stop  %*

src/main/distrib/win/gitblit.cmd

@@ -1 +1,8 @@
-@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.GitBlitServer --baseFolder data %*
+@SETLOCAL
+
+@SET gbhome=%~dp0
+@SET gbhome=%gbhome:~0,-1%
+
+@java -cp "%gbhome%\gitblit.jar";"%gbhome%\ext\*" com.gitblit.GitBlitServer --baseFolder "%gbhome%\data" %*
+
+@ENDLOCAL

src/main/distrib/win/installService.cmd

@@ -8,31 +8,37 @@
 @REM
 @REM http://commons.apache.org/daemon/procrun.html
 
+@SETLOCAL
+
 @REM arch = x86, amd64, or ia32
 SET ARCH=amd64
 
+@SET gbhome=%~dp0
+@SET gbhome=%gbhome:~0,-1%
+
 @REM Be careful not to introduce trailing whitespace after the ^ characters.
 @REM Use ; or # to separate values in the --StartParams parameter.
-"%CD%\%ARCH%\gitblit.exe"  //IS//gitblit ^
+"%gbhome%\%ARCH%\gitblit.exe"  //IS//gitblit ^
 		 --DisplayName="gitblit" ^
 		 --Description="a pure Java Git solution" ^
 		 --Startup=auto ^
-		 --LogPath="%CD%\logs" ^
+		 --LogPath="%gbhome%\logs" ^
 		 --LogLevel=INFO ^
 		 --LogPrefix=gitblit ^
 		 --StdOutput=auto ^
 		 --StdError=auto ^
-		 --StartPath="%CD%" ^
+		 --StartPath="%gbhome%" ^
 		 --StartClass=com.gitblit.GitBlitServer ^
 		 --StartMethod=main ^
-		 --StartParams="--storePassword;gitblit;--baseFolder;%CD%\data" ^
+		 --StartParams="--storePassword;gitblit;--baseFolder;%gbhome%\data" ^
 		 --StartMode=jvm ^
-		 --StopPath="%CD%" ^
+		 --StopPath="%gbhome%" ^
 		 --StopClass=com.gitblit.GitBlitServer ^
 		 --StopMethod=main ^
-		 --StopParams="--stop;--baseFolder;%CD%\data" ^
+		 --StopParams="--stop;--baseFolder;%gbhome%\data" ^
 		 --StopMode=jvm ^
-		 --Classpath="%CD%\gitblit.jar;%CD%\ext\*" ^
+		 --Classpath="%gbhome%\gitblit.jar;%gbhome%\ext\*" ^
 		 --Jvm=auto ^
 		 --JvmMx=1024
-		 
+
+@ENDLOCAL

src/main/distrib/win/migrate-tickets.cmd

@@ -9,13 +9,13 @@
 
 @if [%2]==[] goto help
 
-@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.MigrateTickets %1 --baseFolder %2
+@java -cp "%~dp0gitblit.jar";"%~dp0ext\*" com.gitblit.MigrateTickets %1 --baseFolder %2
 @goto end
 
 :help
-@echo "Please specify the output ticket service and your baseFolder!"
-@echo
-@echo "    migrate-tickets com.gitblit.tickets.RedisTicketService c:/gitblit-data"
-@echo
+@echo Please specify the output ticket service and your baseFolder!
+@echo.
+@echo    e.g.: migrate-tickets com.gitblit.tickets.RedisTicketService "c:/gitblit data"
+@echo.
 
-:end
+:end

src/main/distrib/win/reindex-tickets.cmd

@@ -10,13 +10,13 @@
 @REM --------------------------------------------------------------------------
 @if [%1]==[] goto nobasefolder
 
-@java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.ReindexTickets --baseFolder %1
+@java -cp "%~dp0gitblit.jar";"%~dp0ext\*" com.gitblit.ReindexTickets --baseFolder %1
 @goto end
 
 :nobasefolder
-@echo "Please specify your baseFolder!"
-@echo
-@echo "    reindex-tickets c:/gitblit-data"
-@echo
+@echo Please specify your baseFolder!
+@echo.
+@echo     reindex-tickets c:/gitblit-data
+@echo.
 
-:end
+:end

src/main/distrib/win/uninstallService.cmd

@@ -1,5 +1,9 @@
+@SETLOCAL
+
 @REM arch = x86, amd64, or ia32
 SET ARCH=amd64
 
 @REM Delete the gitblit service
-"%CD%\%ARCH%\gitblit.exe" //DS//gitblit
+"%~dp0%ARCH%\gitblit.exe" //DS//gitblit
+
+@ENDLOCAL