From 995c6217fcde0005f69b5e08a984f7700c66553a Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sat, 1 May 2021 22:22:09 +0800
Subject: [PATCH] Misc fixes

---
 .../com.github.jameshnsears.quoteunquote.yml  |  1 +
 metadata/com.jens.automation2.yml             | 28 +++----------------
 metadata/com.jonjomckay.fritter.yml           |  2 +-
 metadata/com.vsmartcard.acardemulator.yml     |  1 +
 metadata/net.bible.android.activity.yml       |  7 ++++-
 metadata/org.olpc_france.sugarizer.yml        |  1 +
 6 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/metadata/com.github.jameshnsears.quoteunquote.yml b/metadata/com.github.jameshnsears.quoteunquote.yml
index 8e6ba7cb5c..e65015b8f9 100644
--- a/metadata/com.github.jameshnsears.quoteunquote.yml
+++ b/metadata/com.github.jameshnsears.quoteunquote.yml
@@ -51,6 +51,7 @@ Builds:
     submodules: true
     gradle:
       - fdroid
+    prebuild: sed -i -e '/firebase/d' build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags .*-fdroid$
diff --git a/metadata/com.jens.automation2.yml b/metadata/com.jens.automation2.yml
index ca242ccdb5..ec81405483 100644
--- a/metadata/com.jens.automation2.yml
+++ b/metadata/com.jens.automation2.yml
@@ -33,28 +33,7 @@ Builds:
       - sed -i -e '/firebase/d' build.gradle
       - sed -i -e '/play-services-location/d' build.gradle
 
-  - versionName: 1.6.25
-    versionCode: 101
-    disable: old version code
-    commit: v1.6.25
-    subdir: app
-    gradle:
-      - fdroidFlavor
-    prebuild:
-      - sed -i -e '/firebase/d' build.gradle
-      - sed -i -e '/play-services-location/d' build.gradle
-
-  - versionName: 1.6.30-apk
-    versionCode: 102
-    commit: v1.6.30
-    subdir: app
-    gradle:
-      - fdroidFlavor
-    prebuild:
-      - sed -i -e '/firebase/d' build.gradle
-      - sed -i -e '/play-services-location/d' build.gradle
-
-  - versionName: 1.6.32-apk
+  - versionName: 1.6.32
     versionCode: 103
     commit: v1.6.32
     subdir: app
@@ -65,6 +44,7 @@ Builds:
       - sed -i -e '/play-services-location/d' build.gradle
 
 AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
-CurrentVersion: 1.6.32-apk
+UpdateCheckMode: HTTP
+UpdateCheckData: https://git.server47.de/jens/Automation/raw/branch/master/app/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d.]+)"
+CurrentVersion: 1.6.32
 CurrentVersionCode: 103
diff --git a/metadata/com.jonjomckay.fritter.yml b/metadata/com.jonjomckay.fritter.yml
index f9fd9006f9..57ecd2b7fa 100644
--- a/metadata/com.jonjomckay.fritter.yml
+++ b/metadata/com.jonjomckay.fritter.yml
@@ -105,7 +105,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 20210427
-    commit: v2.2.0
+    commit: v2.2.1
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
       - flutter@2.0.4
diff --git a/metadata/com.vsmartcard.acardemulator.yml b/metadata/com.vsmartcard.acardemulator.yml
index 227ce7426e..4bc826bc20 100644
--- a/metadata/com.vsmartcard.acardemulator.yml
+++ b/metadata/com.vsmartcard.acardemulator.yml
@@ -75,6 +75,7 @@ Builds:
 
   - versionName: '3.4'
     versionCode: 7
+    disable: fails to git reset
     commit: virtualsmartcard-0.8
     subdir: ACardEmulator/app
     submodules: true
diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml
index d5d0229a2d..7a03cc611e 100644
--- a/metadata/net.bible.android.activity.yml
+++ b/metadata/net.bible.android.activity.yml
@@ -815,7 +815,12 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm g++ build-essential
+      - apt-get install -y -t stretch-backports g++ build-essential
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v14.16.0/node-v14.16.0-linux-x64.tar.gz
+      - echo "7212031d7468718d7c8f5e1766380daaabe09d54611675338e7a88a97c3e31b6 node.tar.gz"
+        | sha256sum -c -
+      - tar xf node.tar.gz
+      - cp -a node-v14.16.0-linux-x64/. /usr/local/
     gradle:
       - yes
 
diff --git a/metadata/org.olpc_france.sugarizer.yml b/metadata/org.olpc_france.sugarizer.yml
index 6f878adcfc..2bb752b0b0 100644
--- a/metadata/org.olpc_france.sugarizer.yml
+++ b/metadata/org.olpc_france.sugarizer.yml
@@ -94,6 +94,7 @@ Builds:
   - versionName: 1.5.0
     versionCode: 15000
     commit: v1.5.0
+    subdir: app
     gradle:
       - yes