From c1b86cedd2f5e91eee909dcc4186ee9e7d05bbee Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Sun, 14 Mar 2021 01:02:43 +0330
Subject: [PATCH] move getAndroid.sh

---
 {scripts => AndroidCompat}/getAndroid.sh | 7 +++++++
 README.md                                | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 rename {scripts => AndroidCompat}/getAndroid.sh (92%)

diff --git a/scripts/getAndroid.sh b/AndroidCompat/getAndroid.sh
similarity index 92%
rename from scripts/getAndroid.sh
rename to AndroidCompat/getAndroid.sh
index 014ce6d..fb12404 100755
--- a/scripts/getAndroid.sh
+++ b/AndroidCompat/getAndroid.sh
@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
+
+# foolproof against running from AndroidCompat dir instead of running from project root
+if [ "$(basename $(pwd))" = "AndroidCompat" ]; then
+  cd ..
+fi
+
+
 echo "Getting required Android.jar..."
 rm -rf "tmp"
 mkdir -p "tmp"
diff --git a/README.md b/README.md
index 89fb5e2..fcbc357 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ This project has two components:
 #### Manual download
 Download [android.jar](https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
 #### Automated download(needs `bash`, `curl`, `base64`, `zip` to work)
-Run `scripts/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository.
+Run `AndroidCompat/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository.
 ### building the jar
 Run `./gradlew shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
 ### building the Windows package
@@ -76,7 +76,7 @@ How to do it is described in `webUI/react/README.md` but for short,
  and supports HMR and all the other goodies you'll need.
 
 ## Credit
-The `AndroidCompat` module and `scripts/getAndroid.sh` was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`.
+The `AndroidCompat` module was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`.
 
 Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`.