From b080f5417c54cbbf7ff40b6bd4a6e84a77280b0f Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sat, 30 Apr 2022 00:10:02 +0800
Subject: [PATCH] misc fixes

---
 metadata/app.olaunchercf.yml                    | 4 ++++
 metadata/cat.mvmike.minimalcalendarwidget.yml   | 5 +++--
 metadata/com.kolloware.hypezigapp.yml           | 4 ++++
 metadata/com.openear.www.yml                    | 8 ++++----
 metadata/io.github.domi04151309.batterytool.yml | 1 +
 metadata/nl.eduvpn.app.yml                      | 1 +
 metadata/wangdaye.com.geometricweather.yml      | 4 ++++
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/metadata/app.olaunchercf.yml b/metadata/app.olaunchercf.yml
index 9d1d808adf..892498680e 100644
--- a/metadata/app.olaunchercf.yml
+++ b/metadata/app.olaunchercf.yml
@@ -23,6 +23,10 @@ Builds:
     versionCode: 5
     commit: d485e736e7f9d23f8ac599cd28c5da1c05c0f776
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/cat.mvmike.minimalcalendarwidget.yml b/metadata/cat.mvmike.minimalcalendarwidget.yml
index 75ac85f215..a62ae4baf0 100644
--- a/metadata/cat.mvmike.minimalcalendarwidget.yml
+++ b/metadata/cat.mvmike.minimalcalendarwidget.yml
@@ -274,6 +274,7 @@ Builds:
 
   - versionName: 2.5.1
     versionCode: 39
+    disable: java 17
     commit: f58ff2682f49b01643de37dbd61e142bec94b69e
     subdir: app
     sudo:
@@ -290,12 +291,12 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 2.5.2
 CurrentVersionCode: 40
diff --git a/metadata/com.kolloware.hypezigapp.yml b/metadata/com.kolloware.hypezigapp.yml
index 60cae58a07..57db729cfc 100644
--- a/metadata/com.kolloware.hypezigapp.yml
+++ b/metadata/com.kolloware.hypezigapp.yml
@@ -82,6 +82,10 @@ Builds:
     versionCode: 21
     commit: 677e2e354c1e812974e3e7b1ca4b97972cbf3ca0
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.openear.www.yml b/metadata/com.openear.www.yml
index 12e05a87db..fc6ad00253 100644
--- a/metadata/com.openear.www.yml
+++ b/metadata/com.openear.www.yml
@@ -110,15 +110,15 @@ Builds:
 
   - versionName: 1.2.11
     versionCode: 14
+    disable: https://github.com/ShacharHarshuv/open-ear/issues/116
     commit: c0b4b28c62477f780075924a5cf8c5ecb625ee35
     subdir: android
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.xz
-      - echo "0570b9354959f651b814e56a4ce98d4a067bf2385b9a0e6be075739bc65b0fae node.tar.gz"
+      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.xz
+      - echo "0570b9354959f651b814e56a4ce98d4a067bf2385b9a0e6be075739bc65b0fae node.tar.xz"
         | sha256sum -c -
-      - tar xf node.tar.gz
-      - cp -a node-v*-linux-x64/. /usr/local/
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - npm -g install yarn
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
diff --git a/metadata/io.github.domi04151309.batterytool.yml b/metadata/io.github.domi04151309.batterytool.yml
index b9207f18b9..9602c1d744 100644
--- a/metadata/io.github.domi04151309.batterytool.yml
+++ b/metadata/io.github.domi04151309.batterytool.yml
@@ -32,6 +32,7 @@ Builds:
 
   - versionName: 1.1.0
     versionCode: 110
+    disable: https://github.com/Domi04151309/BatteryTool/issues/14
     commit: 96693a966ca56cf4f3f564f40f7b9f0ea4b3d9e1
     subdir: app
     sudo:
diff --git a/metadata/nl.eduvpn.app.yml b/metadata/nl.eduvpn.app.yml
index 53242c7564..c490815d1f 100644
--- a/metadata/nl.eduvpn.app.yml
+++ b/metadata/nl.eduvpn.app.yml
@@ -44,6 +44,7 @@ Builds:
       - ics-openvpn/main/src/main/cpp/mbedtls/programs/fuzz
       - ics-openvpn/main/src/main/cpp/mbedtls/tests
       - ics-openvpn/main/src/main/cpp/openvpn3/test/unittests
+      - ics-openvpn/main/src/main/cpp/lz4
     ndk: r21
 
 AutoUpdateMode: Version %v
diff --git a/metadata/wangdaye.com.geometricweather.yml b/metadata/wangdaye.com.geometricweather.yml
index adaf7a4eb3..e05ec1ece5 100644
--- a/metadata/wangdaye.com.geometricweather.yml
+++ b/metadata/wangdaye.com.geometricweather.yml
@@ -73,6 +73,10 @@ Builds:
     versionCode: 30100
     commit: 441088a4f4ea13ead1a1bfb5d4037c24a7b55392
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     rm: