Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update run.sh to generate net.aliasvault.app.yml with latest version and branch for proper F-Droid build (#1405)
Leendert de Borst266e7b36d4db
diff --git a/apps/mobile-app/android/fdroid/.gitignore b/apps/mobile-app/android/fdroid/.gitignoreindex 30f68ef89..e8a47d513 100644--- a/apps/mobile-app/android/fdroid/.gitignore+++ b/apps/mobile-app/android/fdroid/.gitignore@@ -1,2 +1,3 @@fdroiddatafdroidserver+net.aliasvault.app.ymldiff --git a/apps/mobile-app/android/fdroid/net.aliasvault.app.yml b/apps/mobile-app/android/fdroid/net.aliasvault.app.yml.templatesimilarity index 92%rename from apps/mobile-app/android/fdroid/net.aliasvault.app.ymlrename to apps/mobile-app/android/fdroid/net.aliasvault.app.yml.templateindex 8be62b2cf..489aa4780 100644--- a/apps/mobile-app/android/fdroid/net.aliasvault.app.yml+++ b/apps/mobile-app/android/fdroid/net.aliasvault.app.yml.template@@ -13,9 +13,9 @@ RepoType: gitRepo: https://github.com/aliasvault/aliasvault.gitBuilds:- - versionName: 0.1.0- versionCode: 1- commit: main+ - versionName: __VERSION_NAME__+ versionCode: __VERSION_CODE__+ commit: __COMMIT__subdir: apps/mobile-app/android/app/sudo:- sysctl fs.inotify.max_user_watches=524288 || true@@ -44,6 +44,7 @@ Builds:- apps/mobile-app/node_modules/react-native-context-menu-view/android/build.gradle- apps/mobile-app/node_modules/react-native-get-random-values/android/build.gradle- apps/mobile-app/node_modules/react-native-svg/android/build.gradle+ - apps/mobile-app/node_modules/react-native-vision-camera/android/build.gradlescandelete:- apps/mobile-app/node_modules/diff --git a/apps/mobile-app/android/fdroid/run.sh b/apps/mobile-app/android/fdroid/run.shindex da4b5fd9d..a5441211d 100755--- a/apps/mobile-app/android/fdroid/run.sh+++ b/apps/mobile-app/android/fdroid/run.sh@@ -2,15 +2,64 @@set -e # Exit on any error, except where explicitly ignoredtrap 'echo "π Interrupted. Exiting..."; exit 130' INT # Handle Ctrl+C cleanly+# Get the directory where this script is located+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"+BUILD_GRADLE="${SCRIPT_DIR}/../app/build.gradle"+TEMPLATE_FILE="${SCRIPT_DIR}/net.aliasvault.app.yml.template"+OUTPUT_FILE="${SCRIPT_DIR}/net.aliasvault.app.yml"++# Check if template exists+if [ ! -f "$TEMPLATE_FILE" ]; then+ echo "β Error: Template file not found: $TEMPLATE_FILE"+ exit 1+fi++# Check if build.gradle exists+if [ ! -f "$BUILD_GRADLE" ]; then+ echo "β Error: build.gradle not found: $BUILD_GRADLE"+ exit 1+fi++# Extract version information from build.gradle+echo "π± Extracting version information from build.gradle..."+VERSION_CODE=$(grep -E '^\s*versionCode\s+' "$BUILD_GRADLE" | sed -E 's/.*versionCode\s+([0-9]+).*/\1/')+VERSION_NAME=$(grep -E '^\s*versionName\s+' "$BUILD_GRADLE" | sed -E 's/.*versionName\s+"([^"]+)".*/\1/')++if [ -z "$VERSION_CODE" ] || [ -z "$VERSION_NAME" ]; then+ echo "β Error: Could not extract version information from build.gradle"+ echo " versionCode: ${VERSION_CODE:-not found}"+ echo " versionName: ${VERSION_NAME:-not found}"+ exit 1+fi++# Get current git branch+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")++echo "β Version information extracted:"+echo " versionCode: $VERSION_CODE"+echo " versionName: $VERSION_NAME"+echo " commit: $CURRENT_BRANCH"++# Generate the F-Droid metadata file from template+echo "π Generating F-Droid metadata file..."+sed -e "s/__VERSION_NAME__/$VERSION_NAME/g" \+ -e "s/__VERSION_CODE__/$VERSION_CODE/g" \+ -e "s/__COMMIT__/$CURRENT_BRANCH/g" \+ "$TEMPLATE_FILE" > "$OUTPUT_FILE"++echo "β Generated: $OUTPUT_FILE"+# Create outputs bind dir and set correct permissionsmkdir -p outputssudo chown -R 1000:1000 outputs# Build and run the Docker environment-echo "Building Docker images..."+echo "π³ Building Docker images..."if ! docker compose build; thenecho "β οΈ Warning: Docker build failed, continuing..."fi-echo "Running fdroid-buildserver..."-docker compose run --rm fdroid-buildserver\ No newline at end of file+echo "π Running fdroid-buildserver..."+docker compose run --rm fdroid-buildserver++echo "β F-Droid build completed!"