From da30e11f6ac168e1519dcbc79ac7387123945b8c Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 19 Mar 2019 11:24:20 +0100
Subject: [PATCH] Fix publication of release kiwix-desktop on windows.

---
 appveyor/deploy.sh                | 15 ++++++++++++---
 appveyor/package_kiwix-desktop.sh | 20 ++++++++++++++------
 kiwixbuild/versions.py            |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/appveyor/deploy.sh b/appveyor/deploy.sh
index 0c58757..9f0fed5 100755
--- a/appveyor/deploy.sh
+++ b/appveyor/deploy.sh
@@ -2,11 +2,20 @@ set -e
 
 NIGHTLY_DATE=$(date +%Y-%m-%d)
 NIGHTLY_KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
+RELEASE_KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES
 SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
 
-#if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]]
-#then
+if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]]
+then
   scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
     ${NIGHTLY_KIWIX_ARCHIVES_DIR} \
     ci@download.kiwix.org:/data/download/nightly
-#fi
+fi
+
+if [[ "$APPVEYOR_REPO_TAG" = "true" ]]
+then
+  RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)
+  scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
+      ${RELEASE_ARCHIVES} \
+      ci@download.kiwix.org:/data/download/release/kiwix-desktop
+fi
diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh
index 00a250e..fdc3048 100644
--- a/appveyor/package_kiwix-desktop.sh
+++ b/appveyor/package_kiwix-desktop.sh
@@ -1,13 +1,21 @@
 
 set -e
 
-NIGHTLY_DATE=$(date +%Y-%m-%d)
-NIGHTLY_KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
-KIWIX_ARCH_NAME=kiwix-desktop_$NIGHTLY_DATE.zip
-KIWIX_DIR=kiwix-desktop_$NIGHTLY_DATE
+if [[ "$APPVEYOR_REPO_TAG" = "false" ]]
+then
+  NIGHTLY_DATE=$(date +%Y-%m-%d)
+  KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
+  KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE
+else
+  KIWIX_DESKTOP_VERSION=2.0-beta3
+  KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES
+  KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION}
+fi
+
+KIWIX_ARCH_NAME=${KIWIX_DIR}.zip
 
 mkdir $KIWIX_DIR
-mkdir -p NIGHTLY_KIWIX_ARCHIVES_DIR
+mkdir -p KIWIX_ARCHIVES_DIR
 
 cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR
 /c/Qt/5.11/msvc2017_64/bin/windeployqt --compiler-runtime $KIWIX_DIR
@@ -17,4 +25,4 @@ cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR
 
 /c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/x64/signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe
 
-7z a -tzip $NIGHTLY_KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR
+7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 2f03282..b62c9ea 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -6,7 +6,7 @@ main_project_versions = {
     'libzim': '4.0.5',
     'zim-tools': '1.0.0',
     'zimwriterfs': '1.2',
-    'kiwix-desktop': '2.0-beta3'
+    'kiwix-desktop': '2.0-beta3' # Also need to be change in appveyor/package_kiwix-desktop.sh
 }
 
 # This dictionnary specify what we need to build at each release process.