mrambossekandClaude Opus 4.7
f99b403309
Build fdroidserver-ipfs image / build (push) Successful in 1m16s
scan_repo_files() in fdroidserver picks up any .json file under repo/ whose name isn't in its ignore list. Our renamed index-v2-<hash>.json from the prior rehash run isn't in that list, so the next fdroid update indexed it as an installable "package" with packageName == its sha256. cleanup_stale_indexes in rehash.py already does the right thing — it just ran too late, after the bogus entry was already in the new index. Move the same sweep into the entrypoint, before fdroid update runs, so scan_repo_files() sees a clean directory. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
38 lines
1.2 KiB
Bash
38 lines
1.2 KiB
Bash
#!/bin/sh
|
|
# fdroidserver-ipfs entrypoint.
|
|
#
|
|
# Mirrors the upstream image's behavior — sources bsenv.sh, runs
|
|
# ${fdroidserver}/fdroid with the given args — then automatically invokes
|
|
# fdroidserver-ipfs-rehash after a successful `fdroid update` so callers
|
|
# don't have to remember the second step.
|
|
|
|
set -eu
|
|
. /etc/profile.d/bsenv.sh
|
|
|
|
# Pre-update cleanup: sweep hashed index files left by the prior rehash run.
|
|
# Otherwise fdroidserver's scan_repo_files() picks them up as installable
|
|
# items (their .json extension passes is_repo_file(), since the hashed name
|
|
# isn't in its ignore list) and a bogus "index-v2-<hash>" package shows up
|
|
# in the index. We check every arg (not just $1) so global flags before the
|
|
# subcommand (e.g. `-v update`) still trigger this.
|
|
for arg in "$@"; do
|
|
if [ "$arg" = "update" ]; then
|
|
for repodir in repo archive; do
|
|
if [ -d "$repodir" ]; then
|
|
rm -f "$repodir"/index-v2-*.json "$repodir"/index-v2-*.json.asc
|
|
fi
|
|
done
|
|
break
|
|
fi
|
|
done
|
|
|
|
GRADLE_USER_HOME="${home_vagrant}/.gradle" "${fdroidserver}/fdroid" "$@"
|
|
|
|
# Auto-rehash after a successful update.
|
|
for arg in "$@"; do
|
|
if [ "$arg" = "update" ]; then
|
|
fdroidserver-ipfs-rehash
|
|
break
|
|
fi
|
|
done
|