New wrapper batch script for Windows

The new script acts as the main entrypoint for commands on Windows.  It
sets up a temporary (local) path where the gin-cli can find all
necessary binaries (git, git-annex, etc.) and then runs the command with
the user's arguments.  If this script is in the user's %path%, the rest
of the software doesn't need to be.  The bundled binaries take precedent
over any existing binaries with the same name in the %path% since the
temporary paths are prepended before calling gin.exe.

The set-global.bat file has been adjusted to add only the path with the
gin.bat in it.  It also prompts the user to clean their path of any
existing GIN CLI paths, if any are detected.
This is better done manually, since parsing and editing the path is too
error prone.

Author: achilleas-k

dorelease

@@ -439,6 +439,7 @@ def winbundle(binfile, git_pkg, annex_pkg):
         shutil.copy("README.md", pkgroot)
         shutil.copy(os.path.join("scripts", "gin-shell.bat"), pkgroot)
         shutil.copy(os.path.join("scripts", "set-global.bat"), pkgroot)
+        shutil.copy(os.path.join("scripts", "gin.bat"), pkgroot)
 
         gitdir = os.path.join(pkgroot, "git")
         os.makedirs(gitdir)

scripts/gin.bat

@@ -0,0 +1,18 @@
+:: GIN client entry point for Windows
+::
+:: This file should be part of the gin client Windows bundle.
+::
+:: The purpose of the file is to act as a wrapper for the GIN CLI binary. It
+:: sets the path to use the bundled dependencies without polluting the user's
+:: permanent global path.
+
+
+@echo off
+
+setlocal
+set gindir=%~dp0
+set ginpaths=%gindir%bin;%gindir%git\usr\bin;%gindir%git\bin
+set path=%ginpaths%;%path%
+
+gin.exe %*
+endlocal

scripts/set-global.bat

@@ -1,16 +1,30 @@
 :: GIN client global setup for Windows
-:: 
+::
 :: This file should be part of the gin client Windows bundle. The purpose of
 :: the file is to permanently change the user path environment to be able to
 :: run GIN commands from the command line (cmd and PowerShell).
 
-echo off
+@echo off
 
-set curdir=%~dp0
+set ginpath=%~dp0
+
+:: Get user path *only* (No system path)
+for /F "skip=2 tokens=1,2*" %%N in ('%SystemRoot%\System32\reg.exe query "HKCU\Environment" /v "Path" 2^>nul') do if /I "%%N" == "Path" call set "userpath=%%P"
+
+echo "Checking"
+echo %userpath%|find /I "gin">nul && (
+    echo Please edit the "Path" variable and remove all previous GIN CLI paths.
+    echo The environment variables settings window will open automatically.
+    pause
+    rundll32 sysdm.cpl,EditEnvironmentVariables
+)
+
+:: Read again
+for /F "skip=2 tokens=1,2*" %%N in ('%SystemRoot%\System32\reg.exe query "HKCU\Environment" /v "Path" 2^>nul') do if /I "%%N" == "Path" call set "userpath=%%P"
+
+:: Prepend GIN path
+echo Prepending "%ginpath%;" to path
+setx path "%ginpath%;%userpath%"
 
-set ginbinpath=%curdir%\bin
-set gitpaths=%curdir%\git\usr\bin;%curdir%\git\bin
-echo Appending "%ginbinpath%;%gitpaths%" to path
-echo %path%|find /I "%curdir%">nul || setx path "%path%;%ginbinpath%;%gitpaths%"
 echo GIN CLI is ready
 pause