[installer] Fix small bugs

IceflowRE · Nov 2, 2017 · 0a8808b · 0a8808b
1 parent 81a4a8d
commit 0a8808b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/installer/hybrid/config/config.xml b/installer/hybrid/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>MP3 Monitoring</Name>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Title>MP3 Monitoring Setup</Title>
     <Publisher>Iceflower S</Publisher>
     <ProductUrl>https://gitlab.com/Iceflower/mp3-monitoring/</ProductUrl>

diff --git a/installer/hybrid/packages/mp3monitoring.gui/meta/package.xml b/installer/hybrid/packages/mp3monitoring.gui/meta/package.xml
@@ -3,8 +3,8 @@
     <Name>mp3monitoring.gui</Name>
     <DisplayName>Gui</DisplayName>
     <Description>Installs the requirements for the gui: PyQt5 (~80MB). An internet connection is required.</Description>
-    <Version>1.0.1</Version>
-    <ReleaseDate>2017-10-13</ReleaseDate>
+    <Version>1.0.2</Version>
+    <ReleaseDate>2017-11-02</ReleaseDate>
     <Default>false</Default>
     <Dependencies>mp3monitoring</Dependencies>
     <Script>installscript.js</Script>

diff --git a/installer/hybrid/packages/mp3monitoring.updater/meta/package.xml b/installer/hybrid/packages/mp3monitoring.updater/meta/package.xml
@@ -3,8 +3,8 @@
     <Name>mp3monitoring.updater</Name>
     <DisplayName>Updater</DisplayName>
     <Description>Installs the requirements for the updater: urllib3 (~150KB). An internet connection is required.</Description>
-    <Version>1.0.1</Version>
-    <ReleaseDate>2017-10-13</ReleaseDate>
+    <Version>1.0.2</Version>
+    <ReleaseDate>2017-11-02</ReleaseDate>
     <!-- <Default>false</Default> -->
     <Virtual>true</Virtual>
     <Dependencies>mp3monitoring</Dependencies>

diff --git a/installer/hybrid/packages/mp3monitoring/meta/installscript.js b/installer/hybrid/packages/mp3monitoring/meta/installscript.js
@@ -1,5 +1,5 @@
 var tmpDir = "@RootDir@/tmp/mp3monitoring/";
-var wheelName = "MP3_Monitoring-1.0.0-py3-none-any.whl";
+var wheelName = "MP3_Monitoring-1.0.2-py36-none-any.whl";
 
 function Component() {
 

diff --git a/installer/hybrid/packages/mp3monitoring/meta/package.xml b/installer/hybrid/packages/mp3monitoring/meta/package.xml
@@ -3,8 +3,8 @@
     <Name>mp3monitoring</Name>
     <DisplayName>MP3 Monitoring</DisplayName>
     <Description>Installs the basic tools and its requirements: tqdm (~100KB), mutagen (~1MB). An internet connection is required.</Description>
-    <Version>1.0.1</Version>
-    <ReleaseDate>2017-10-13</ReleaseDate>
+    <Version>1.0.2</Version>
+    <ReleaseDate>2017-11-02</ReleaseDate>
     <ForcedInstallation>true</ForcedInstallation>
     <Licenses>
         <License name="GPLv3" file="LICENSE.md" />

diff --git a/mp3monitoring/data/static.py b/mp3monitoring/data/static.py
@@ -1,7 +1,7 @@
 """
 Data which are constants and should be available global.
 """
-VERSION = '1.0.1'
+VERSION = '1.0.2'
 NAME = 'MP3-Monitoring'
 AUTHOR = 'Iceflower S'
 AUTHOR_GITHUB = 'https://github.com/IceflowRE'

diff --git a/scripts/create_installer.sh b/scripts/create_installer.sh
@@ -1,31 +1,29 @@
 #!/bin/sh
 # executed from project root
 
-cd installer
-cur_folder="./hybrid/config/data"
+cur_folder="./installer/hybrid/config/data"
 rm -rf ${cur_folder}
 mkdir -p ${cur_folder}
-inkscape ../mp3monitoring/pkg_data/gui/icon_export.svg --export-png=${cur_folder}/icon.png -w512 -h512
+inkscape ./mp3monitoring/pkg_data/gui/icon_export.svg --export-png=${cur_folder}/icon.png -w512 -h512
 
-cur_folder="./hybrid/packages/mp3monitoring/data/"
+cur_folder="./installer/hybrid/packages/mp3monitoring/data/"
 rm -rf ${cur_folder}
 mkdir -p ${cur_folder}
-cp ../README.md ${cur_folder}/README.md
-cp ../dist/MP3_Monitoring-1.0.1-py36-none-any.whl ${cur_folder}/MP3_Monitoring-1.0.1-py36-none-any.whl
+cp ./README.md ${cur_folder}/README.md
+cp ./dist/MP3_Monitoring-1.0.2-py36-none-any.whl ${cur_folder}/MP3_Monitoring-1.0.2-py36-none-any.whl
 
-cur_folder="./hybrid/packages/mp3monitoring.gui/data/"
+cur_folder="./installer/hybrid/packages/mp3monitoring.gui/data/"
 rm -rf ${cur_folder}
 mkdir -p ${cur_folder}
-cp ./icon.ico ${cur_folder}/icon.ico
+cp ./installer/icon.ico ${cur_folder}/icon.ico
 
-cur_folder="./hybrid/packages/mp3monitoring/meta/"
-cp ../LICENSE.md ${cur_folder}/LICENSE.md
+cur_folder="./installer/hybrid/packages/mp3monitoring/meta/"
+cp ./LICENSE.md ${cur_folder}/LICENSE.md
 
 mkdir -p bin
-binarycreator -c ./hybrid/config/config.xml -p ./hybrid/packages/ --offline-only "./bin/MP3 Monitoring Hybrid Setup.exe"
+binarycreator -c ./installer/hybrid/config/config.xml -p ./installer/hybrid/packages/ --offline-only "./installer/bin/MP3 Monitoring Hybrid Setup.exe"
 if [ $? -ne 0 ]; then
     exit 1
 fi
-cd ..
 
 exit 0