From 26fd4a4b260b2fa6e867954ebcd29e31a6084760 Mon Sep 17 00:00:00 2001
From: Bernd <32555742+bekuno@users.noreply.github.com>
Date: Fri, 22 Nov 2019 20:16:43 +0100
Subject: [PATCH 1/3] apk upload to fdroid need change for new cgeo-contact
 addon (fix #1)

fixes #1
---
 scripts/fdroid-update.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/fdroid-update.sh b/scripts/fdroid-update.sh
index 8eb21e5..d15e55d 100755
--- a/scripts/fdroid-update.sh
+++ b/scripts/fdroid-update.sh
@@ -94,8 +94,10 @@ function drop_duplicate_versioncode {
 if [[ $1 == "mainline" ]]; then
    $verbose && echo "I: Finding download links"
    apk=$(curl -s https://api.github.com/repos/cgeo/cgeo/releases/latest | grep 'browser_' | cut -d\" -f4)
-   download_apk "cgeo-release" "$apk" "mainline"
-   download_apk "cgeo-contacts" "https://github.com/cgeo/cgeo/releases/download/market_20150112/cgeo-contacts_v1.5.apk" "mainline"
+   release=$(echo $apk|grep 'https\S*cgeo-release-\S*apk' -o)
+   contacts=$(echo $apk|grep 'https\S*cgeo-contacts-\S*apk' -o)
+   download_apk "cgeo-release" "$release" "mainline"
+   download_apk "cgeo-contacts" "$contacts" "mainline"
    update_indexes "mainline"
 fi
 
@@ -108,4 +110,3 @@ if [[ $1 == "nightly" ]]; then
    done
    update_indexes "nightly"
 fi
-

From 2c6aaa8fbe8e7f318ad5031fe79199d278c1e793 Mon Sep 17 00:00:00 2001
From: Bernd <32555742+bekuno@users.noreply.github.com>
Date: Sat, 23 Nov 2019 12:16:16 +0100
Subject: [PATCH 2/3] set cgeo contacts back to a direct path

---
 scripts/fdroid-update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/fdroid-update.sh b/scripts/fdroid-update.sh
index d15e55d..211e17a 100755
--- a/scripts/fdroid-update.sh
+++ b/scripts/fdroid-update.sh
@@ -95,9 +95,8 @@ if [[ $1 == "mainline" ]]; then
    $verbose && echo "I: Finding download links"
    apk=$(curl -s https://api.github.com/repos/cgeo/cgeo/releases/latest | grep 'browser_' | cut -d\" -f4)
    release=$(echo $apk|grep 'https\S*cgeo-release-\S*apk' -o)
-   contacts=$(echo $apk|grep 'https\S*cgeo-contacts-\S*apk' -o)
    download_apk "cgeo-release" "$release" "mainline"
-   download_apk "cgeo-contacts" "$contacts" "mainline"
+   download_apk "cgeo-contacts" "https://github.com/cgeo/cgeo/releases/download/market_20191111/cgeo-contacts-release_17.apk" "mainline"
    update_indexes "mainline"
 fi
 

From b89cb2efbb087e153bf3d1c9d56b1ea5cec33bb2 Mon Sep 17 00:00:00 2001
From: Bernd <32555742+bekuno@users.noreply.github.com>
Date: Sat, 23 Nov 2019 16:03:46 +0100
Subject: [PATCH 3/3] delete unnessary "-"

All latest cgeo apk packages had the name
  cgeo-release.apk
or
  cgeo-release_XXXXXXXX.apk
(XX is the date)

In
  https\S*cgeo-release\S*apk
we find with \S* all non whitespace symbols. eg. current
  https://github.com/cgeo/cgeo/releases/download/market_20191111/cgeo-release.apk
---
 scripts/fdroid-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fdroid-update.sh b/scripts/fdroid-update.sh
index 211e17a..409b1e8 100755
--- a/scripts/fdroid-update.sh
+++ b/scripts/fdroid-update.sh
@@ -94,7 +94,7 @@ function drop_duplicate_versioncode {
 if [[ $1 == "mainline" ]]; then
    $verbose && echo "I: Finding download links"
    apk=$(curl -s https://api.github.com/repos/cgeo/cgeo/releases/latest | grep 'browser_' | cut -d\" -f4)
-   release=$(echo $apk|grep 'https\S*cgeo-release-\S*apk' -o)
+   release=$(echo $apk|grep 'https\S*cgeo-release\S*apk' -o)
    download_apk "cgeo-release" "$release" "mainline"
    download_apk "cgeo-contacts" "https://github.com/cgeo/cgeo/releases/download/market_20191111/cgeo-contacts-release_17.apk" "mainline"
    update_indexes "mainline"