From 5a0cb96353ab7470e3a45d03df78dc415d6ce0bc Mon Sep 17 00:00:00 2001 From: Steven Pousty Date: Mon, 4 Apr 2022 11:47:30 -0700 Subject: [PATCH 1/3] Fixing bug with geode home determination If you place the product_dir in a path with "bin" in, the old method would ruin the path. For example `C:\Users\steve\bin\apache-geode-1.14.4\bin\` would become `C:\Users\steveapache-geode-1.14.4` This implementation cuts off the last 4 letters of the bin directory to get to the installation location. --- geode-assembly/src/main/dist/bin/gfsh.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index ed8636c8bf6f..68cac9881cc0 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -27,7 +27,7 @@ REM setlocal enableextensions set scriptdir=%~dp0 -set gf=%scriptdir:\bin\=% +set gf=%scriptdir:~0,-4% REM echo %gf% REM echo %scriptdir% if exist "%gf%\lib\geode-dependencies.jar" goto gfok From 1804834ead5ad0b8e8920acfdaf37d2d3d6a6b97 Mon Sep 17 00:00:00 2001 From: Steven Pousty Date: Wed, 6 Apr 2022 08:58:59 -0700 Subject: [PATCH 2/3] Update gfsh.bat --- geode-assembly/src/main/dist/bin/gfsh.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index 68cac9881cc0..476d5c309ec4 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -27,6 +27,7 @@ REM setlocal enableextensions set scriptdir=%~dp0 +REM Remove last 4 chars corresponding to bin\ set gf=%scriptdir:~0,-4% REM echo %gf% REM echo %scriptdir% From 28920caebe6dc2ac214eb565936fcece74529190 Mon Sep 17 00:00:00 2001 From: Owen Nichols <34043438+onichols-pivotal@users.noreply.github.com> Date: Fri, 20 May 2022 18:32:05 -0700 Subject: [PATCH 3/3] Update gfsh.bat re-trigger CI since new checks have been added --- geode-assembly/src/main/dist/bin/gfsh.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index 476d5c309ec4..8e270204b979 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -27,7 +27,7 @@ REM setlocal enableextensions set scriptdir=%~dp0 -REM Remove last 4 chars corresponding to bin\ +REM Remove last 4 chars which are presumably "bin\" set gf=%scriptdir:~0,-4% REM echo %gf% REM echo %scriptdir%