mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webapp: fix termux detection

Browse source 
The bundled uname -o says Linux in termux; have runshell on Android
delete it so the termux one is used instead.

This fixes the webapp so it will enter Android mode.

This commit was sponsored by mo on Patreon.
This commit is contained in:
Joey Hess 2018-10-13 12:08:27 -04:00
parent 38d691a10f
commit d14983ee68
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -4,6 +4,7 @@ git-annex (6.20181012) UNRELEASED; urgency=medium
* Removed support for building with very old ghc < 8.0.1,
and with yesod < 1.4.3, and without concurrent-output,
which were onyl being used for the Android cross build.
* Webapp: Fix termux detection.
-- Joey Hess <id@joeyh.name> Sat, 13 Oct 2018 00:52:02 -0400

3
standalone/linux/skel/runshell
View file

@ -189,6 +189,9 @@ case "$os" in
# it and use termux's git which works better.
cd "$base"
find . | grep git | grep -v git-annex | grep -v git-remote-tor-annex | grep -v git-remote-gcrypt | xargs rm -rf
# Use termux's uname, which knows it's on android,
# not the bundled one.
rm -f bin/uname
# Fix shell scripts to work when run inside proot.
termux-fix-shebang bin/* runshell git-annex git-annex-shell git-annex-webapp
cd "$orig"