assistant: Adjust ssh authorized keys line generated in local pairing or for a remote ssh server to set environment variables in an alternative way that works with the non-POSIX fix shell, as well as POSIX shells.

Assistant/Ssh.hs

@@ -197,7 +197,7 @@ authorizedKeysLine gitannexshellonly dir pubkey
 	 - long perl script. -}
 	| otherwise = pubkey
   where
-	limitcommand = "command=\"GIT_ANNEX_SHELL_DIRECTORY="++shellEscape dir++" ~/.ssh/git-annex-shell\",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty "
+	limitcommand = "command=\"env GIT_ANNEX_SHELL_DIRECTORY="++shellEscape dir++" ~/.ssh/git-annex-shell\",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty "
 
 {- Generates a ssh key pair. -}
 genSshKeyPair :: IO SshKeyPair

debian/changelog

@@ -28,6 +28,10 @@ git-annex (5.20140321) UNRELEASED; urgency=medium
     to add the missing settings. For details, see
     http://git-annex.branchable.com/bugs/problems_with_glacier/
   * Added required content configuration.
+  * assistant: Adjust ssh authorized keys line generated in local pairing
+    or for a remote ssh server to set environment variables in an 
+    alternative way that works with the non-POSIX fix shell, as well
+    as POSIX shells.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 21 Mar 2014 14:08:41 -0400
 

doc/bugs/issues_with_non-posix_compatible_shells.mdwn

@@ -32,3 +32,10 @@ remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook ex
 
 # End of transcript or log.
 """]]
+
+> [[fixed|done]] so
+> 
+> I have not tried to make the assistant go back and fix up existing
+> `authorized_keys` lines. So if someone had been using a posix shell and
+> switched to fish, they'll hit this and need to fix it themselves. I judge
+> this is pretty small number of users. --[[Joey]]