Assistant: Fix installation of menus, icons, etc when run from within runshell.

runshell followed by git annex webapp didn't install that stuff, because
GIT_ANNEX_APP_BASE is not set. Running git-annex.linux/git-annex-webapp did
install that stuff, since that script set the env var. I noticed this with
the termux port whose instructions currently go that way.

Seems the right thing to do is to move the env var setting to runshell.
This commit is contained in:
Joey Hess 2018-04-25 17:58:00 -04:00
parent bed5271d3f
commit b2accf9da1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 6 additions and 49 deletions

View file

@ -20,6 +20,8 @@ git-annex (6.20180410) UNRELEASED; urgency=medium
a repository on the sdcard.
* Assistant: Integrate with Termux:Boot, so when it's installed, the
assistant is autostarted on boot.
* Assistant: Fix installation of menus, icons, etc when run
from within runshell.
-- Joey Hess <id@joeyh.name> Mon, 09 Apr 2018 14:03:28 -0400

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git "$@"

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git-annex "$@"

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git-annex-shell "$@"

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git-annex webapp "$@"

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git-receive-pack "$@"

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git-shell "$@"

View file

@ -21,11 +21,4 @@ cd "$base"
base="$(pwd)"
cd "$orig"
# If this is a standalone app, set a variable that git-annex can use to
# install itself.
if [ -e "$base/bin/git-annex" ]; then
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
fi
exec "$base/runshell" git-upload-pack "$@"

View file

@ -77,6 +77,10 @@ if [ -z "$GIT_ANNEX_PACKAGE_INSTALL" ]; then
fi
fi
# Used by git-annex assistant to further install itself.
GIT_ANNEX_APP_BASE="$base"
export GIT_ANNEX_APP_BASE
# Put our binaries first, to avoid issues with out of date or incompatible
# system binaries. Extra binaries come after system path.
ORIG_PATH="$PATH"