Fix installation on Android

Unfortunately, commit ce95cac195 broke
android installation way back in May of last year.
This commit is contained in:
Joey Hess 2025-01-07 14:13:46 -04:00
parent 79d0f1da03
commit cbc83c0386
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 14 additions and 2 deletions

View file

@ -5,6 +5,7 @@ git-annex (10.20250103) UNRELEASED; urgency=medium
* log: Support --key, as well as --branch and --unused.
* Avoid verification error when addurl --verifiable is used
with an url claimed by a special remote other than the web.
* Fix installation on Android.
-- Joey Hess <id@joeyh.name> Fri, 03 Jan 2025 14:30:38 -0400

View file

@ -28,3 +28,6 @@ I have tried downloading the `.tar.gz` file and extracting it manually. Inside I
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Works great on all of my Fedora, Ubuntu, and Rocky machines!
> Thanks for reporting, I have now fixed the bug in runshell. [[done]]
> --[[Joey]]

View file

@ -73,4 +73,4 @@ sed: can't read /data/data/com.termux/files/home/git-annex.linux/git-remote-anne
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
> [[fixed|done]] --[[Joey]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2025-01-07T18:11:59Z"
content="""
Indeed that is the same bug. And I've fixed it now, the next daily build
and release will have the fix.
"""]]

View file

@ -206,7 +206,7 @@ case "$os" in
# The bundled git does not work well on sdcard, so delete
# 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
find . | grep git | grep -v git-annex | grep -v git-remote-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