Android: Improve installation process when the user's login shell is not bash.
~/.profile works for bash, but not all other login shells. This setting PATH is a minor convenience for users, particuarly since typing on android is so much harder. The usual linux standalone bundle just expects the user to know how to add it to PATH. I don't want this code to grow special cases for every possible login shell. So displaying a message to the presumably minority who don't use bash seems like the best choice. Longer term, I'd hope termux gets some way to set an environment variable for all login shells. Systems using PAM can, via ~/.pam_environment. Or alternatively, add a git-annex package to termux, even if just an installer package. I'd rather spend time on either of those than on making this minor thing support more login shells. This commit was sponsored by mo on Patreon.
This commit is contained in:
parent
a14f6ce758
commit
f2a54e3401
3 changed files with 14 additions and 3 deletions
|
@ -185,7 +185,7 @@ case "$os" in
|
|||
# Make this bundle work well on Android.
|
||||
Android)
|
||||
if [ -e "$base/git" ]; then
|
||||
echo "Running on Android.. Adding git-annex to PATH for you, and tuning for optimal behavior." >&2
|
||||
echo "Running on Android.. Tuning for optimal behavior." >&2
|
||||
# The bundled git does not work well on sdcard, so delete
|
||||
# it and use termux's git which works better.
|
||||
cd "$base"
|
||||
|
@ -197,8 +197,13 @@ case "$os" in
|
|||
termux-fix-shebang bin/* runshell git-annex git-annex-shell git-annex-webapp
|
||||
cd "$orig"
|
||||
# Save the poor Android user the typing.
|
||||
if ! [ -e "$HOME/.profile" ] || ! grep -q "$base" "$HOME/.profile"; then
|
||||
echo 'PATH=$PATH:'"$base" >> $HOME/.profile
|
||||
if echo "$SHELL" | grep -q '/bash'; then
|
||||
if ! [ -e "$HOME/.profile" ] || ! grep -q "$base" "$HOME/.profile"; then
|
||||
echo "Adding git-annex to PATH for you, in $HOME/.profile"
|
||||
echo 'PATH=$PATH:'"$base" >> $HOME/.profile
|
||||
fi
|
||||
else
|
||||
echo "To use git-annex, you will need to add $base to your shell's PATH."
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue