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:
parent
bed5271d3f
commit
b2accf9da1
9 changed files with 6 additions and 49 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue