From ba69bc3c41f656a889bc6e912462a558d734adc7 Mon Sep 17 00:00:00 2001 From: Zwixx Date: Wed, 26 May 2021 17:05:26 +0200 Subject: Use full path to Gitblit directory in batch scripts In order to call the Windows batch scripts on the command line from a different folder, the path to the files in the Gitblit directory needs to be explicitly stated in the Java command. Otherwise the JAR files or data directory are not found as they would be searched in the current directory. --- src/main/distrib/win/gitblit-stop.cmd | 2 +- src/main/distrib/win/gitblit.cmd | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/distrib/win/gitblit-stop.cmd b/src/main/distrib/win/gitblit-stop.cmd index b6bebd8a..b2cdbc44 100644 --- a/src/main/distrib/win/gitblit-stop.cmd +++ b/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 %* diff --git a/src/main/distrib/win/gitblit.cmd b/src/main/distrib/win/gitblit.cmd index 6cd193dd..c02e3896 100644 --- a/src/main/distrib/win/gitblit.cmd +++ b/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 -- cgit v1.2.3 From 879ef53a94f23927a7ce3e8d5c05ac3731e37e79 Mon Sep 17 00:00:00 2001 From: Zwixx Date: Wed, 26 May 2021 17:47:17 +0200 Subject: Add this into the install/uninstall and reindex of the service too --- src/main/distrib/win/installService.cmd | 17 ++++++++++------- src/main/distrib/win/reindex-tickets.cmd | 2 +- src/main/distrib/win/uninstallService.cmd | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main/distrib/win/installService.cmd b/src/main/distrib/win/installService.cmd index ef2ba2d0..532c63cd 100644 --- a/src/main/distrib/win/installService.cmd +++ b/src/main/distrib/win/installService.cmd @@ -11,28 +11,31 @@ @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 \ No newline at end of file diff --git a/src/main/distrib/win/reindex-tickets.cmd b/src/main/distrib/win/reindex-tickets.cmd index c9116ca2..a2226d86 100644 --- a/src/main/distrib/win/reindex-tickets.cmd +++ b/src/main/distrib/win/reindex-tickets.cmd @@ -10,7 +10,7 @@ @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 diff --git a/src/main/distrib/win/uninstallService.cmd b/src/main/distrib/win/uninstallService.cmd index e6c3b98c..a32007e8 100644 --- a/src/main/distrib/win/uninstallService.cmd +++ b/src/main/distrib/win/uninstallService.cmd @@ -1,5 +1,6 @@ + @REM arch = x86, amd64, or ia32 SET ARCH=amd64 @REM Delete the gitblit service -"%CD%\%ARCH%\gitblit.exe" //DS//gitblit \ No newline at end of file +"%~dp0%ARCH%\gitblit.exe" //DS//gitblit -- cgit v1.2.3 From d42411430114374bde004f38dae506704ceb3d3f Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Wed, 21 Jul 2021 09:50:59 +0200 Subject: Adjust remaining CMD scripts to use Gitblit home path. Use the path of the script for the Gitblit home path in the remaining batch scripts, too, to make it possible to call them from any other folder. --- src/main/distrib/win/add-indexed-branch.cmd | 2 ++ src/main/distrib/win/authority.cmd | 9 ++++++++- src/main/distrib/win/migrate-tickets.cmd | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/distrib/win/add-indexed-branch.cmd b/src/main/distrib/win/add-indexed-branch.cmd index 37121ee6..af540777 100644 --- a/src/main/distrib/win/add-indexed-branch.cmd +++ b/src/main/distrib/win/add-indexed-branch.cmd @@ -17,4 +17,6 @@ @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 diff --git a/src/main/distrib/win/authority.cmd b/src/main/distrib/win/authority.cmd index 3a27c8a9..a313cd73 100644 --- a/src/main/distrib/win/authority.cmd +++ b/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 diff --git a/src/main/distrib/win/migrate-tickets.cmd b/src/main/distrib/win/migrate-tickets.cmd index 5a26c8ed..641157e8 100644 --- a/src/main/distrib/win/migrate-tickets.cmd +++ b/src/main/distrib/win/migrate-tickets.cmd @@ -9,7 +9,7 @@ @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 -- cgit v1.2.3 From 159f7fcf759a4d779d50173c6aa866915fb60a62 Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Wed, 21 Jul 2021 09:54:27 +0200 Subject: Set local variable visibility in batch scripts Use SETLOCAL in batch scripts to restrict the visibility of variables that are set in the script to the script execution. Otherwise the variables will also be set in the calling shell. That is not a problem when a script is executed by double clicking it in Windows Explorer. But now that the scripts are changed so that they can be called on the command line from other folders, they should also no clutter the calling environment. --- src/main/distrib/win/add-indexed-branch.cmd | 2 ++ src/main/distrib/win/installService.cmd | 5 ++++- src/main/distrib/win/uninstallService.cmd | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/distrib/win/add-indexed-branch.cmd b/src/main/distrib/win/add-indexed-branch.cmd index af540777..25b46383 100644 --- a/src/main/distrib/win/add-indexed-branch.cmd +++ b/src/main/distrib/win/add-indexed-branch.cmd @@ -14,9 +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 diff --git a/src/main/distrib/win/installService.cmd b/src/main/distrib/win/installService.cmd index 532c63cd..23d45a46 100644 --- a/src/main/distrib/win/installService.cmd +++ b/src/main/distrib/win/installService.cmd @@ -8,6 +8,8 @@ @REM @REM http://commons.apache.org/daemon/procrun.html +@SETLOCAL + @REM arch = x86, amd64, or ia32 SET ARCH=amd64 @@ -38,4 +40,5 @@ SET ARCH=amd64 --Classpath="%gbhome%\gitblit.jar;%gbhome%\ext\*" ^ --Jvm=auto ^ --JvmMx=1024 - \ No newline at end of file + +@ENDLOCAL diff --git a/src/main/distrib/win/uninstallService.cmd b/src/main/distrib/win/uninstallService.cmd index a32007e8..6a574d19 100644 --- a/src/main/distrib/win/uninstallService.cmd +++ b/src/main/distrib/win/uninstallService.cmd @@ -1,6 +1,9 @@ +@SETLOCAL @REM arch = x86, amd64, or ia32 SET ARCH=amd64 @REM Delete the gitblit service "%~dp0%ARCH%\gitblit.exe" //DS//gitblit + +@ENDLOCAL -- cgit v1.2.3 From fd51a29c3cc80a188113809c662ef45aa6a4e81c Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Wed, 21 Jul 2021 09:58:55 +0200 Subject: Fix output of migrate-/reindex-tickets bash scripts Fix the output of the help texts in the reindex-tickets and reindex-tickets bash scripts. For one the double quotes are unnecessary and get printed out, too. Secondly, an empty line needs a `echo.`. A simple `echo` will prin the state of the echo setting, i.e. `Echo is enabled (1)` or something similar. --- src/main/distrib/win/migrate-tickets.cmd | 10 +++++----- src/main/distrib/win/reindex-tickets.cmd | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/main/distrib/win/migrate-tickets.cmd b/src/main/distrib/win/migrate-tickets.cmd index 641157e8..e08c5a84 100644 --- a/src/main/distrib/win/migrate-tickets.cmd +++ b/src/main/distrib/win/migrate-tickets.cmd @@ -13,9 +13,9 @@ @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 \ No newline at end of file +:end diff --git a/src/main/distrib/win/reindex-tickets.cmd b/src/main/distrib/win/reindex-tickets.cmd index a2226d86..49eb122e 100644 --- a/src/main/distrib/win/reindex-tickets.cmd +++ b/src/main/distrib/win/reindex-tickets.cmd @@ -14,9 +14,9 @@ @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 \ No newline at end of file +:end -- cgit v1.2.3