aboutsummaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-09-10 13:28:32 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-09-10 13:28:32 -0400
commit624df7cc156db9ac163f9a27051286adb5191791 (patch)
tree104b262c8a2906552c712b237ea7e8d384265280 /standalone
parentd3cbedcfe3702cc8bcd784a6655227eb03675cb2 (diff)
add \usr\bin to path
This is where these commands are installed by the new "git for windows". Kept the old paths too, so msysgit will still work. This was enough to get ssh and ssh-keygen working when run at the DOS prompt with the new git for windows installed. However, for some reason, rsync still fails to find ssh in path when that version of git is used.
Diffstat (limited to 'standalone')
-rw-r--r--standalone/windows/ssh-keygen.cmd4
-rw-r--r--standalone/windows/ssh.cmd4
2 files changed, 4 insertions, 4 deletions
diff --git a/standalone/windows/ssh-keygen.cmd b/standalone/windows/ssh-keygen.cmd
index c4ec3cdb4..3afd28f47 100644
--- a/standalone/windows/ssh-keygen.cmd
+++ b/standalone/windows/ssh-keygen.cmd
@@ -11,7 +11,7 @@
@rem Get the absolute path to the parent directory, which is assumed to be the
@rem Git installation root.
@for /F "delims=" %%I in ("%~dp0..") do @set git_install_root=%%~fI
-@set PATH=!git_install_root!\bin;!git_install_root!\mingw\bin;!PATH!
+@set PATH=!git_install_root!\bin;!git_install_root!\usr\bin;!git_install_root!\mingw\bin;!PATH!
ssh-keygen %*
@goto end
@@ -20,7 +20,7 @@ ssh-keygen %*
@rem The above script again with immediate expansion, in case delayed expansion
@rem is unavailable.
@for /F "delims=" %%I in ("%~dp0..") do @set git_install_root=%%~fI
-@set PATH=%git_install_root%\bin;%git_install_root%\mingw\bin;%PATH%
+@set PATH=%git_install_root%\bin;%git_install_root%\usr\bin;%git_install_root%\mingw\bin;%PATH%
@if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH%
@if not exist "%HOME%" @set HOME=%USERPROFILE%
diff --git a/standalone/windows/ssh.cmd b/standalone/windows/ssh.cmd
index 32aa60a4d..ad9b5c300 100644
--- a/standalone/windows/ssh.cmd
+++ b/standalone/windows/ssh.cmd
@@ -11,7 +11,7 @@
@rem Get the absolute path to the parent directory, which is assumed to be the
@rem Git installation root.
@for /F "delims=" %%I in ("%~dp0..") do @set git_install_root=%%~fI
-@set PATH=!git_install_root!\bin;!git_install_root!\mingw\bin;!PATH!
+@set PATH=!git_install_root!\bin;!git_install_root!\usr\bin;!git_install_root!\mingw\bin;!PATH!
ssh %*
@goto end
@@ -20,7 +20,7 @@ ssh %*
@rem The above script again with immediate expansion, in case delayed expansion
@rem is unavailable.
@for /F "delims=" %%I in ("%~dp0..") do @set git_install_root=%%~fI
-@set PATH=%git_install_root%\bin;%git_install_root%\mingw\bin;%PATH%
+@set PATH=%git_install_root%\bin;%git_install_root%\usr\bin;%git_install_root%\mingw\bin;%PATH%
@if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH%
@if not exist "%HOME%" @set HOME=%USERPROFILE%