gnucash-on-flatpak master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/2beab5cf (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/097cfb6a (commit)
	from  https://github.com/Gnucash/gnucash-on-flatpak/commit/ab9812f8 (commit)



commit 2beab5cf46670c204b7acc2381677b1237e103fc
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Mar 2 13:11:29 2023 -0800

    Update AQBanking to 6.5.4.

diff --git a/modules/aqbanking.json b/modules/aqbanking.json
index 2e60bed..d9f39c6 100644
--- a/modules/aqbanking.json
+++ b/modules/aqbanking.json
@@ -5,8 +5,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://www.aquamaniac.de/rdm/attachments/download/467/aqbanking-6.5.3.tar.gz",
-            "sha256": "6c62bf26aa42e69b21e188b54f6a5d825d6da34de1a14cbc3b67d85a9705136e"
+            "url": "https://www.aquamaniac.de/rdm/attachments/download/499/aqbanking-6.5.4.tar.gz",
+            "sha256": "0d16ceae76f0718e466638f4547a8b14927f1d8d98322079cd6481adde30ac99"
         }
     ],
     "modules": [

commit 097cfb6abbe1d3d28e72b419d158e0e162f15d09
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jan 7 18:02:36 2023 -0800

    Add argument -i to force is_release.
    
    So one can do a test build from a tarball without pushing the tag.

diff --git a/build_package.sh b/build_package.sh
index 7c88834..102c127 100755
--- a/build_package.sh
+++ b/build_package.sh
@@ -35,8 +35,9 @@ revision=maint
 
 . "$fp_git_dir"/functions.sh
 
+is_release="undecided"
 # Parse command line options
-while getopts "hr:c:d:" o; do
+while getopts "hr:c:d:i:" o; do
     case "${o}" in
         r)
             revision=${OPTARG}
@@ -50,13 +51,15 @@ while getopts "hr:c:d:" o; do
         h)
             usage
             ;;
+        i)
+            is_release=${OPTARG}
+            ;;
         *)
             usage
             ;;
     esac
 done
 
-is_release="undecided"
 code_revision=${code_revision:-${revision}}
 docs_revision=${docs_revision:-${revision}}
 
@@ -78,23 +81,25 @@ upload_build_log
 trap cleanup ERR
 
 # Check for new commits in code
-package=${code_package}
-repodir=${code_repodir}
-prepare_repo ${code_revision}
-get_versions
+if [[ "x${is_release}" != "xyes" ]]; then
+    package=${code_package}
+    repodir=${code_repodir}
+    prepare_repo ${code_revision}
+    get_versions
 
-code_curr_rev=${gc_commit}
-code_full_version=${gc_full_version}
 
-# Check for new commits in docs
-package=${docs_package}
-repodir=${docs_repodir}
-prepare_repo ${docs_revision}
-get_versions
+    code_curr_rev=${gc_commit}
+    code_full_version=${gc_full_version}
 
-docs_curr_rev=${gc_commit}
-docs_full_version=${gc_full_version}
+# Check for new commits in docs
+    package=${docs_package}
+    repodir=${docs_repodir}
+    prepare_repo ${docs_revision}
+    get_versions
 
+    docs_curr_rev=${gc_commit}
+    docs_full_version=${gc_full_version}
+fi
 # Compose the default branch name to use in the flatpak repo
 fp_branch="$revision-C$code_full_version-D$docs_full_version"
 



Summary of changes:
 build_package.sh       | 35 ++++++++++++++++++++---------------
 modules/aqbanking.json |  4 ++--
 2 files changed, 22 insertions(+), 17 deletions(-)