From 61db2c0d238b4d9ffcc5d8a94a63e0951565fa0f Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 21 Mar 2020 12:20:51 +0100
Subject: [PATCH] Rename android shell to accentor-android

---
 shells/{android.nix => accentor-android.nix} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename shells/{android.nix => accentor-android.nix} (94%)

diff --git a/shells/android.nix b/shells/accentor-android.nix
similarity index 94%
rename from shells/android.nix
rename to shells/accentor-android.nix
index b550508f..ecd8dac6 100644
--- a/shells/android.nix
+++ b/shells/accentor-android.nix
@@ -55,7 +55,8 @@ let
     gradle-run-script = pkgs.writeScriptBin "gradle" ''
       #!${pkgs.bash}/bin/bash
 
-      nix-shell --argstr run "./gradlew $@" "${gradle-fhs-nix}"
+      REPO_ROOT="$(git rev-parse --show-toplevel)"
+      nix-shell --argstr run "$REPO_ROOT/gradlew $@" "${gradle-fhs-nix}"
     '';
 
     sign-release = pkgs.writeScriptBin "sign-release" ''
@@ -65,8 +66,8 @@ let
       REPO_ROOT="$(git rev-parse --show-toplevel)"
       APK_DIR="$REPO_ROOT/app/build/outputs/apk/release"
 
-      rm "$APK_DIR/app-release-unsigned-aligned.apk"
-      rm "$APK_DIR/app-release.apk"
+      rm "$APK_DIR/"*
+      ${gradle-run-script}/bin/gradle assembleRelease
       "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk"
 
       "$BUILD_TOOLS_PATH/apksigner" sign --ks "$REPO_ROOT/keystore.jks" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk"