From e292310ba3b71cf11c6ce278063ed895e7533cf6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Dec 2014 13:34:13 -0400 Subject: [PATCH] Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH. --- Build/BundledPrograms.hs | 6 ++---- Build/NullSoftInstaller.hs | 8 ++------ debian/changelog | 4 ++-- ...erver_error_while_adding_remote_server_on_Windows.mdwn | 4 ++++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index 5eb0b1f283..d5cf3ee7b9 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -31,17 +31,15 @@ bundledPrograms = catMaybes , Just "cp" #ifndef mingw32_HOST_OS -- using xargs on windows led to problems, so it's not used there - -- (and msysgit includes a copy anyway) , Just "xargs" #endif , Just "rsync" #ifndef darwin_HOST_OS -#ifndef mingw32_HOST_OS -- OS X has ssh installed by default. -- 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" -#endif , Just "ssh-keygen" #endif #ifndef mingw32_HOST_OS diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 913472a4ee..bc94e60cd0 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index cf3c0ee2e8..5080112f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,8 @@ git-annex (5.20141126) UNRELEASED; urgency=medium * Don't show "(gpg)" when decrypting the remote encryption cipher, since this could be taken to read that's the only time git-annex runs gpg, which is not the case. - * Windows: ssh is no longer included in the git-annex bundle, - since msysgit includes it. + * Windows: Install ssh and other bundled programs to Git/cmd, + instead of Git/bin, since the latter is not in the default msysgit PATH. -- Joey Hess Mon, 10 Nov 2014 15:31:55 -0400 diff --git a/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows.mdwn b/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows.mdwn index bf19a2223e..76a88808ef 100644 --- a/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows.mdwn +++ b/doc/bugs/Internal_server_error_while_adding_remote_server_on_Windows.mdwn @@ -27,3 +27,7 @@ recv: failed (No error) # 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]]