[gimp] build: cleaner flatpak building script.

[Jehan Pagès <jehanp src gnome org>]

commit 399ac63548384d3a1ec855587dd719cff3fd0569
Author: Jehan <jehan girinstud io>
Date:   Wed May 16 20:00:11 2018 +0200

    build: cleaner flatpak building script.

 build/flatpak/gimp-flatpak-cron.sh |  114 +++++++++++++++++------------------
 1 files changed, 55 insertions(+), 59 deletions(-)
---
diff --git a/build/flatpak/gimp-flatpak-cron.sh b/build/flatpak/gimp-flatpak-cron.sh
index aba1b25..e49508e 100755
--- a/build/flatpak/gimp-flatpak-cron.sh
+++ b/build/flatpak/gimp-flatpak-cron.sh
@@ -29,7 +29,6 @@ flatpak update --user
 DIR="$(dirname "$(readlink -f "$0")")"
 cd $DIR
 git pull --force
-#cd build/flatpak/
 
 mkdir -p logs
 mkdir -p builds
@@ -48,21 +47,13 @@ log_title() {
   echo "[GIMP-FLATPAK-CRON] (`date`) $1" >> $LOGFILE
 }
 
-# Prepare build commands.
-flatpak_build() {
-  # 1/ Update and export the BaseApp only if the json changed.
-  # 3/ Update the local flatpak install. This assumes that the baseapp has
-  #    already been locally installed with --user.
-  # 4/ Update and export the dev flatpak only if the json changed.
-  # 5/ Update and export the nightly flatpak even if the json hasn't
-  #    changed.
+flatpak_build_baseapp() {
   ARCH=$1
-  # Use ccache to improve build speed. Clean previous build directories.
-  # Keep build dirs for later debugging if ever any build issue arised.
+
   BUILD_OPTIONS="--ccache --force-clean --keep-build-dirs"
-  echo "[GIMP-FLATPAK-CRON] (`date`) Building BaseApp for $ARCH"
   log_title "Building BaseApp for $ARCH"
   if test -f "baseapp-tmp-repo/config"; then
+    # Update and export the BaseApp only if the json changed.
     SKIP="--skip-if-unchanged"
   else
     SKIP=""
@@ -71,73 +62,80 @@ flatpak_build() {
                   "builds/gimp-flatpak-${ARCH}-baseapp" flathub/org.gimp.BaseApp.json \
                   > "logs/gimp-flatpak-build-${ARCH}-baseapp.log" 2>&1
   ret="$?"
+
   if test $ret -eq 0; then
-    echo "[GIMP-FLATPAK-CRON] (`date`) Exporting BaseApp for $ARCH"
     log_title "Exporting BaseApp for $ARCH"
     flatpak-builder --export-only --gpg-sign="$GPGKEY" --repo="baseapp-tmp-repo" \
                     --arch="$ARCH" \
                     "builds/gimp-flatpak-${ARCH}-baseapp" flathub/org.gimp.BaseApp.json \
                     >> "logs/gimp-flatpak-build-${ARCH}-baseapp.log" 2>&1
+    ret="$?"
     log_title "Installing/Updating BaseApp for $ARCH"
-    echo "\t* Installing/Updating BaseApp for $ARCH"
+    # Update as a local flatpak repository.
     flatpak remote-add --user --no-gpg-verify --if-not-exists baseapp-repo baseapp-tmp-repo \
                >> "logs/gimp-flatpak-build-${ARCH}-baseapp.log" 2>&1
     flatpak install --user -y --arch="$ARCH" baseapp-repo org.gimp.BaseApp \
                >> "logs/gimp-flatpak-build-${ARCH}-baseapp.log" 2>&1
     flatpak update --user >> "logs/gimp-flatpak-build-${ARCH}-baseapp.log" 2>&1
   fi
+
   # 0 is success build and 42 is skipping for unchanged json.
-  if test $ret -eq 0 || test $ret -eq 42; then
-    echo "[GIMP-FLATPAK-CRON] (`date`) Building Dev release for $ARCH"
-    log_title "Building Dev release for $ARCH"
+  return $ret
+}
+
+flatpak_build_branch() {
+  ARCH=$1
+  BRANCH=$2
+  FORCE=$3
+
+  # Use ccache to improve build speed. Clean previous build directories.
+  # Keep build dirs for later debugging if ever any build issue arised.
+  BUILD_OPTIONS="--ccache --force-clean --keep-build-dirs"
+
+  log_title "Building $BRANCH release for $ARCH"
+  SKIP=""
+  if test "x$FORCE" != "xyes"; then
     if test -f "$REPO/config"; then
       SKIP="--skip-if-unchanged"
-    else
-      SKIP=""
     fi
-    flatpak-builder $SKIP $BUILD_OPTIONS --arch="$ARCH" \
-                    "builds/gimp-flatpak-${ARCH}-dev" org.gimp.GIMP-dev.json \
-                    > "logs/gimp-flatpak-build-$ARCH-dev.log" 2>&1
-    ret="$?"
-    if test $ret -eq 0; then
-      log_title "Exporting Dev release for $ARCH"
-      echo "[GIMP-FLATPAK-CRON] (`date`) Exporting Dev release for $ARCH"
-        flatpak-builder --export-only --gpg-sign="$GPGKEY" --repo="$REPO" \
-                        --arch="$ARCH" \
-                        "builds/gimp-flatpak-${ARCH}-dev" org.gimp.GIMP-dev.json \
-                        >> "logs/gimp-flatpak-build-$ARCH-dev.log" 2>&1
-    fi
-    log_title "Building Nightly release for $ARCH"
-    echo "[GIMP-FLATPAK-CRON] (`date`) Building Nightly release for $ARCH"
-    flatpak-builder $BUILD_OPTIONS --arch="$ARCH" \
-                    "builds/gimp-flatpak-${ARCH}-nightly" org.gimp.GIMP-nightly.json \
-                    > "logs/gimp-flatpak-build-${ARCH}-nightly.log" 2>&1
+  fi
+  flatpak-builder $SKIP $BUILD_OPTIONS --arch="$ARCH" \
+                  "builds/gimp-flatpak-${ARCH}-$BRANCH" \
+                  org.gimp.GIMP-$BRANCH.json \
+                  > "logs/gimp-flatpak-build-$ARCH-$BRANCH.log" 2>&1
+  ret="$?"
+  if test $ret -eq 0; then
+    log_title "Exporting $BRANCH release for $ARCH"
+    flatpak-builder --export-only --gpg-sign="$GPGKEY" --repo="$REPO" \
+                    --arch="$ARCH" \
+                    "builds/gimp-flatpak-${ARCH}-$BRANCH" \
+                    org.gimp.GIMP-$BRANCH.json \
+                    >> "logs/gimp-flatpak-build-$ARCH-$BRANCH.log" 2>&1
     ret="$?"
-    if test $ret -eq 0; then
-      log_title "Exporting Nightly release for $ARCH"
-      echo "[GIMP-FLATPAK-CRON] (`date`) Exporting Nightly release for $ARCH"
-      flatpak-builder --export-only --gpg-sign="$GPGKEY" --repo="$REPO" \
-                      --arch="$ARCH" \
-                      "builds/gimp-flatpak-${ARCH}-nightly" org.gimp.GIMP-nightly.json \
-                      >> "logs/gimp-flatpak-build-${ARCH}-nightly.log" 2>&1
-    else
-      return $ret
-    fi
+  fi
+
+  return $ret
+}
+
+flatpak_build() {
+  ARCH=$1
+
+  flatpak_build_baseapp $ARCH
+  ret=$?
+  if test $ret -eq 0 || test $ret -eq 42; then
+    flatpak_build_branch $ARCH dev no
+    flatpak_build_branch $ARCH nightly yes
   fi
 }
 
 #### Build flatpaks ####
 
-## x86-64
-log_title "Building x86-64 flatpak..."
-echo Building x86-64 flatpak...
-flatpak_build "x86_64"
-x86_64_success=$?
-## i386
-log_title "Building i386 flatpak..."
-echo "Building i386 flatpak..."
-flatpak_build "i386"
-i386_success=$?
+success=""
+for arch in "i386" "x86_64"; do
+  log_title "Building $arch flatpak..."
+  flatpak_build $arch
+  success="$success\nBuild for $arch returned: $?."
+done
 
 #### End notification ####
 
@@ -146,9 +144,7 @@ log_archive="gimp-flatpak-logs-`date --iso-8601`.tar.xz"
 rm -f "$log_archive"
 tar cf "$log_archive" logs/
 
-message="Flatpak build started at $start_date, ended at $end_date."
-message="$message\nBuild for x86-64 returned: $x86_64_success."
-message="$message\nBuild for i386 returned: $i386_success."
+message="Flatpak build started at $start_date, ended at $end_date.\n$success"
 
 printf "$message" |mailx -s "GIMP Flatpak build" -A "$LOGFILE" $MAIL >> $LOGFILE 2>&1
 #rm -f "$log_archive"