From 32c19f2f036fcb1c732aa6060f3d345e89649215 Mon Sep 17 00:00:00 2001
From: Howard Wu <40033067+Howard20181@users.noreply.github.com>
Date: Tue, 13 Sep 2022 19:11:45 +0800
Subject: [PATCH 1/4] Workaround #108

---
 scripts/build.sh             | 2 +-
 scripts/generateGappsLink.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 8c8ffe7..3369bd9 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -399,7 +399,7 @@ if [ "$GAPPS_BRAND" != 'none' ]; then
 fi
 
 echo "Expand images"
-
+if [ ! -f /etc/mtab ]; then sudo ln -s /proc/self/mounts /etc/mtab; fi
 e2fsck -yf "$WORK_DIR"/wsa/"$ARCH"/system_ext.img || abort
 SYSTEM_EXT_SIZE=$(($(du --apparent-size -sB512 "$WORK_DIR"/wsa/"$ARCH"/system_ext.img | cut -f1) + 20000))
 if [ -d "$WORK_DIR"/gapps/system_ext ]; then
diff --git a/scripts/generateGappsLink.py b/scripts/generateGappsLink.py
index d3350c0..d1d7b47 100644
--- a/scripts/generateGappsLink.py
+++ b/scripts/generateGappsLink.py
@@ -45,6 +45,9 @@ if brand == "OpenGApps":
         j = json.loads(res.content)
         link = {i["name"]: i for i in j["archs"][abi_map[arch]]
                 ["apis"][release]["variants"]}[variant]["zip"]
+        # print(f"JSON={j}", flush=True)
+        DATE=j["archs"][abi_map[arch]]["date"]
+        print(f"DATE={DATE}", flush=True)
     except Exception:
         print("Failed to fetch from OpenGApps API, fallbacking to SourceForge RSS...")
         res = requests.get(

From adac72361762c190b071df40f0faff40ed03f0b6 Mon Sep 17 00:00:00 2001
From: bri <284789+b-@users.noreply.github.com>
Date: Wed, 14 Sep 2022 12:36:18 -0400
Subject: [PATCH 2/4] add 7zip to check_dependencies() in run.sh (#111)

---
 scripts/run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/run.sh b/scripts/run.sh
index 907e85f..88ae948 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -43,6 +43,7 @@ check_dependencies() {
     command -v resize2fs >/dev/null 2>&1 || NEED_INSTALL+=("e2fsprogs")
     command -v pip >/dev/null 2>&1 || NEED_INSTALL+=("python3-pip")
     command -v aria2c >/dev/null 2>&1 || NEED_INSTALL+=("aria2")
+    command -v 7zip > /dev/null 2>&1 || NEED_INSTALL+=("7zip")
 }
 check_dependencies
 declare -A os_pm_install;

From 48bf7f8d15321420b09927f553fb06d0490e6930 Mon Sep 17 00:00:00 2001
From: Howard Wu <40033067+Howard20181@users.noreply.github.com>
Date: Thu, 15 Sep 2022 00:38:03 +0800
Subject: [PATCH 3/4] Update run.sh

---
 scripts/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index 88ae948..8d32ba8 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -43,7 +43,7 @@ check_dependencies() {
     command -v resize2fs >/dev/null 2>&1 || NEED_INSTALL+=("e2fsprogs")
     command -v pip >/dev/null 2>&1 || NEED_INSTALL+=("python3-pip")
     command -v aria2c >/dev/null 2>&1 || NEED_INSTALL+=("aria2")
-    command -v 7zip > /dev/null 2>&1 || NEED_INSTALL+=("7zip")
+    command -v 7z > /dev/null 2>&1 || NEED_INSTALL+=("p7zip")
 }
 check_dependencies
 declare -A os_pm_install;

From 317fb9419895e304d9c2d42a67882d4a735728b3 Mon Sep 17 00:00:00 2001
From: Howard Wu <40033067+Howard20181@users.noreply.github.com>
Date: Thu, 15 Sep 2022 00:38:43 +0800
Subject: [PATCH 4/4] Update run.sh

---
 scripts/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index 8d32ba8..0aa2096 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -43,7 +43,7 @@ check_dependencies() {
     command -v resize2fs >/dev/null 2>&1 || NEED_INSTALL+=("e2fsprogs")
     command -v pip >/dev/null 2>&1 || NEED_INSTALL+=("python3-pip")
     command -v aria2c >/dev/null 2>&1 || NEED_INSTALL+=("aria2")
-    command -v 7z > /dev/null 2>&1 || NEED_INSTALL+=("p7zip")
+    command -v 7z > /dev/null 2>&1 || NEED_INSTALL+=("p7zip-full")
 }
 check_dependencies
 declare -A os_pm_install;