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
parent 10b139956a
commit e292310ba3
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Build/NullSoftInstaller.hs
View file

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