From 462ee6e4b9c1f02cde9675db33bd2dfe474c445a Mon Sep 17 00:00:00 2001
From: norulz <norulz.gal@gmail.com>
Date: Thu, 4 Oct 2018 10:54:54 +0300
Subject: [PATCH] Release fine tuning

---
 linux-create-installer.sh                     | 19 +++++++++++++++----
 linux_build_appimage.sh                       |  2 +-
 .../meta/package.xml                          |  2 +-
 .../meta/package.xml                          |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/linux-create-installer.sh b/linux-create-installer.sh
index 99c50a8a..65d7d274 100755
--- a/linux-create-installer.sh
+++ b/linux-create-installer.sh
@@ -2,6 +2,7 @@
 
 # Creates installer from an already built application and data
 # Assumes this script being copied to the root of 'qtbuild' in the following folder structure:
+# UPDATE VERSION and RELEASE DATES in all component xml files
 
 # -- qtbuild 
 #		-- linux_online_installer					(structure as copied from the repository clone)
@@ -26,11 +27,18 @@
 # After running the script the compiled installers should be in the linux_online_installer folder and the repository should be ready for upload
 #
 
-
+XVER="1.1.2"
 
 ## go to the installer build folder
 cd linux_online_installer
 
+## check that the AppImage exits and executable bit is set
+if [ -z "packages/org.opengribs.xygrib.core.linux/data/XyGrib.AppImage" ]; then
+	echo "XyGrib.AppImage is not in the core data folder, can't continue"
+	exit 1
+fi
+chmod a+x packages/org.opengribs.xygrib.core.linux/data/XyGrib.AppImage
+
 ## build the repository which should be empty (new one each time)
 if which repogen >/dev/null; then
   REPOGEN='repogen'
@@ -59,8 +67,11 @@ if [ -z "$BINARYCREATOR" ]; then
   echo "Tool binarycreator not found, can't continue"
   exit 1
 fi
-$BINARYCREATOR --online-only -v -c config/config.xml -p packages XyGrib_Linux_Online_Installer
-$BINARYCREATOR -v -c config/config.xml -p packages -e org.opengribs.xygrib.maps XyGrib_Linux_Offline_Installer
-$BINARYCREATOR -v --offline-only -c config/config.xml -p packages  XyGrib_Linux_Testing_Installer
+$BINARYCREATOR --online-only -v -c config/config.xml -p packages XyGrib_Linux_Online_Installer_v$XVER
+$BINARYCREATOR -v -c config/config.xml -p packages -e org.opengribs.xygrib.maps XyGrib_Linux_Offline_Installer_v$XVER
+$BINARYCREATOR -v --offline-only -c config/config.xml -p packages  XyGrib_Linux_Testing_Installer_v$XVER
+tar -cvzf XyGrib_Linux_Online_Installer_v$XVER.tgz XyGrib_Linux_Online_Installer_v$XVER
+tar -cvzf XyGrib_Linux_Offline_Installer_v$XVER.tgz XyGrib_Linux_Offline_Installer_v$XVER
+tar -cvzf XyGrib_Linux_Testing_Installer_v$XVER.tgz XyGrib_Linux_Testing_Installer_v$XVER
 
 echo "++++ All Done ++++"
diff --git a/linux_build_appimage.sh b/linux_build_appimage.sh
index 1e29640f..28704327 100755
--- a/linux_build_appimage.sh
+++ b/linux_build_appimage.sh
@@ -52,5 +52,5 @@ fi
 $DEPLOY usr/share/applications/xygrib.desktop -qmake=$QMK -no-translations -bundle-non-qt-libs -appimage -verbose=2
 
 ## rename it
-mv XyGrib-x86_64.AppImage XyGrib.Linux.AppImage
+mv XyGrib-x86_64.AppImage XyGrib.AppImage
 
diff --git a/mac_online_installer/packages/org.opengribs.xygrib.core.mac/meta/package.xml b/mac_online_installer/packages/org.opengribs.xygrib.core.mac/meta/package.xml
index 00fabc5f..7b776186 100644
--- a/mac_online_installer/packages/org.opengribs.xygrib.core.mac/meta/package.xml
+++ b/mac_online_installer/packages/org.opengribs.xygrib.core.mac/meta/package.xml
@@ -3,7 +3,7 @@
     <DisplayName>XyGrib Mac Core Application Files</DisplayName>
     <Description>Executable and libraries needed to run the application.</Description>
     <Version>1.1.2</Version>
-    <ReleaseDate>2018-09-17</ReleaseDate>
+    <ReleaseDate>2018-10-05</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License Version 3" file="license.txt" />
     </Licenses>
diff --git a/mac_online_installer/packages/org.opengribs.xygrib.data/meta/package.xml b/mac_online_installer/packages/org.opengribs.xygrib.data/meta/package.xml
index 57d6c4f7..dbaa35a4 100644
--- a/mac_online_installer/packages/org.opengribs.xygrib.data/meta/package.xml
+++ b/mac_online_installer/packages/org.opengribs.xygrib.data/meta/package.xml
@@ -3,7 +3,7 @@
     <DisplayName>XyGrib Static Data</DisplayName>
     <Description>Data needed by XyGrib such as maps, gis info, color schemes and translations</Description>
     <Version>1.1.2</Version>
-    <ReleaseDate>2018-10-03</ReleaseDate>
+    <ReleaseDate>2018-10-05</ReleaseDate>
     <Default>true</Default>
 	<SortingPriority>002</SortingPriority>
     <Script>installscript.qs</Script>