mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH.

Browse source
This commit is contained in:
Joey Hess 2014-12-03 13:34:13 -04:00
commit e292310ba3
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Build/BundledPrograms.hs
View file

@ -31,17 +31,15 @@ bundledPrograms = catMaybes
, Just "cp" , Just "cp"
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
-- using xargs on windows led to problems, so it's not used there -- using xargs on windows led to problems, so it's not used there
-- (and msysgit includes a copy anyway)
, Just "xargs" , Just "xargs"
#endif #endif
, Just "rsync" , Just "rsync"
#ifndef darwin_HOST_OS #ifndef darwin_HOST_OS
#ifndef mingw32_HOST_OS
-- OS X has ssh installed by default. -- OS X has ssh installed by default.
-- Linux probably has ssh, but not guaranteed. -- Linux probably has ssh, but not guaranteed.
-- On Windows, msysgit provides ssh, but not ssh-keygen. -- On Windows, msysgit provides ssh, but not in PATH,
-- so we ship our own.
, Just "ssh" , Just "ssh"
#endif
, Just "ssh-keygen" , Just "ssh-keygen"
#endif #endif
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS

8
Build/NullSoftInstaller.hs
View file

@ -133,12 +133,9 @@ makeInstaller gitannex license extrabins launchers = nsis $ do
, IconIndex 2 , IconIndex 2
, Description "git-annex autostart" , Description "git-annex autostart"
] ]
section "bins" [] $ do
setOutPath "$INSTDIR\\bin"
mapM_ addfile extrabins
section "cmd" [] $ do section "cmd" [] $ do
setOutPath "$INSTDIR\\cmd" setOutPath "$INSTDIR\\cmd"
addfile gitannex mapM_ addfile (gitannex:extrabins)
section "meta" [] $ do section "meta" [] $ do
setOutPath "$INSTDIR" setOutPath "$INSTDIR"
addfile license addfile license
@ -147,8 +144,7 @@ makeInstaller gitannex license extrabins launchers = nsis $ do
uninstall $ do uninstall $ do
delete [RebootOK] $ startMenuItem delete [RebootOK] $ startMenuItem
delete [RebootOK] $ autoStartItem delete [RebootOK] $ autoStartItem
removefilesFrom "$INSTDIR/bin" extrabins removefilesFrom "$INSTDIR/cmd" (gitannex:extrabins)
removefilesFrom "$INSTDIR/cmd" [gitannex]
removefilesFrom "$INSTDIR" $ removefilesFrom "$INSTDIR" $
launchers ++ launchers ++
[ license [ license

4
debian/changelog vendored
View file

@ -18,8 +18,8 @@ git-annex (5.20141126) UNRELEASED; urgency=medium
* Don't show "(gpg)" when decrypting the remote encryption cipher, * Don't show "(gpg)" when decrypting the remote encryption cipher,
since this could be taken to read that's the only time git-annex since this could be taken to read that's the only time git-annex
runs gpg, which is not the case. runs gpg, which is not the case.
* Windows: ssh is no longer included in the git-annex bundle, * Windows: Install ssh and other bundled programs to Git/cmd,
since msysgit includes it. instead of Git/bin, since the latter is not in the default msysgit PATH.
-- Joey Hess <joeyh@debian.org> Mon, 10 Nov 2014 15:31:55 -0400 -- Joey Hess <joeyh@debian.org> Mon, 10 Nov 2014 15:31:55 -0400

4
doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows.mdwn
View file

@ -27,3 +27,7 @@ recv: failed (No error)
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[fixed|done]]; git-annex's ssh is now installed to Git/cmd,
> so it will be in the PATH as long as the instructions are followed to let
> msysgit add git to the PATH. --[[Joey]]