The standalone tarball's runshell now takes care of installing a ~/.ssh/git-annex-shell wrapper the first time it's run.

This commit is contained in:
Joey Hess 2012-10-29 14:40:28 -04:00
parent 0ffce4a942
commit f89d6dd33e
2 changed files with 15 additions and 0 deletions

2
debian/changelog vendored
View file

@ -31,6 +31,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low
pushed to about pushes. pushed to about pushes.
* rsync special remote: Include annex-rsync-options when running rsync * rsync special remote: Include annex-rsync-options when running rsync
to test a key's presence. to test a key's presence.
* The standalone tarball's runshell now takes care of installing a
~/.ssh/git-annex-shell wrapper the first time it's run.
-- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400

View file

@ -26,6 +26,19 @@ cd "$base"
base="$(pwd)" base="$(pwd)"
cd "$orig" cd "$orig"
# Install shim that's used to run git-annex-shell from ssh authorized_keys.
# The assistant also does this when run, but the user may not be using the
# assistant.
if [ ! -e "$HOME/.ssh/git-annex-shell" ]; then
mkdir "$HOME/.ssh" >/dev/null 2>&1 || true
(
echo "#!/bin/sh"
echo "set -e"
echo "exec $base/runshell git-annex-shell -c \"\$SSH_ORIGINAL_COMMAND\""
) > "$HOME/.ssh/git-annex-shell"
chmod +x "$HOME/.ssh/git-annex-shell"
fi
# Put our binaries first, to avoid issues with out of date or incompatable # Put our binaries first, to avoid issues with out of date or incompatable
# system binaries. # system binaries.
PATH=$base/bin:$PATH PATH=$base/bin:$PATH