From a3ec77f0438e38ec80aa229d0ce0c307179a930b Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 20 Jun 2024 13:59:09 +0800
Subject: [PATCH] misc fixes

---
 metadata/ac.mdiq.podcini.yml                  |  9 --------
 metadata/com.atharok.btremote.yml             |  9 +-------
 .../com.chancesoftwarellc.blazedcloud.yml     | 21 ++++++++-----------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/metadata/ac.mdiq.podcini.yml b/metadata/ac.mdiq.podcini.yml
index cacc9db8bb..51112d0659 100644
--- a/metadata/ac.mdiq.podcini.yml
+++ b/metadata/ac.mdiq.podcini.yml
@@ -152,15 +152,6 @@ Builds:
     prebuild: sed -i -r -e '/play(Api|Implementation)/d' -e '/wearable/d' build.gradle
     ndk: 25.1.8937393
 
-  - versionName: 5.5.1
-    versionCode: 3020151
-    commit: a78d108dc9439b4d31ed356f877567adc7aebfc3
-    subdir: app
-    gradle:
-      - free
-    prebuild: sed -i -r -e '/play(Api|Implementation)/d' -e '/wearable/d' build.gradle
-    ndk: 25.1.8937393
-
   - versionName: 5.5.2
     versionCode: 3020152
     commit: bd60e72da078fb0a627e2caafd10366f02cd0dbf
diff --git a/metadata/com.atharok.btremote.yml b/metadata/com.atharok.btremote.yml
index 16aac711b6..f1f4dd13a4 100644
--- a/metadata/com.atharok.btremote.yml
+++ b/metadata/com.atharok.btremote.yml
@@ -32,16 +32,9 @@ Builds:
     gradle:
       - default
 
-  - versionName: 1.2.1
-    versionCode: 4
-    disable: https://gitlab.com/Atharok/BtRemote/-/issues/3
-    commit: e6abc415a53ae09a8f31d52aaa0be9898d452c54
-    subdir: app
-    gradle:
-      - default
-
   - versionName: 1.2.2
     versionCode: 5
+    disable: https://gitlab.com/Atharok/BtRemote/-/issues/3
     commit: 9823b93dc3f58020a35dec38b564d1a32caa3fb5
     subdir: app
     gradle:
diff --git a/metadata/com.chancesoftwarellc.blazedcloud.yml b/metadata/com.chancesoftwarellc.blazedcloud.yml
index 03ea319c3a..4298582935 100644
--- a/metadata/com.chancesoftwarellc.blazedcloud.yml
+++ b/metadata/com.chancesoftwarellc.blazedcloud.yml
@@ -1451,10 +1451,9 @@ Builds:
       - ios
       - test
     prebuild:
-      - version=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/flutter.yml)
-      - pushd $$flutter$$
-      - git checkout -f $version
-      - popd
+      - flutterVersion=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/flutter.yml)
+      - '[[ $flutterVersion ]] || exit 1'
+      - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
@@ -1476,10 +1475,9 @@ Builds:
       - ios
       - test
     prebuild:
-      - version=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/flutter.yml)
-      - pushd $$flutter$$
-      - git checkout -f $version
-      - popd
+      - flutterVersion=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/flutter.yml)
+      - '[[ $flutterVersion ]] || exit 1'
+      - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
@@ -1501,10 +1499,9 @@ Builds:
       - ios
       - test
     prebuild:
-      - version=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/flutter.yml)
-      - pushd $$flutter$$
-      - git checkout -f $version
-      - popd
+      - flutterVersion=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/flutter.yml)
+      - '[[ $flutterVersion ]] || exit 1'
+      - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get