From 37c774221d1729075e8e76b3badcb8f5c332658a Mon Sep 17 00:00:00 2001
From: TheJackiMonster <thejackimonster@gmail.com>
Date: Mon, 26 Apr 2021 22:57:43 +0200
Subject: [PATCH] Small patches for linux build scripts

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 package/build_for_windows.sh | 8 ++++++--
 package/create_rpm.sh        | 3 ++-
 package/prepare_linux.sh     | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package/build_for_windows.sh b/package/build_for_windows.sh
index 082c29b1..a3ee2d21 100755
--- a/package/build_for_windows.sh
+++ b/package/build_for_windows.sh
@@ -53,6 +53,8 @@ cd $DIR
 git clone $REPOSITORY
 cd manuskript
 
+PKG_VERSION=$(grep -E "__version__.*\".*\"" "manuskript/version.py" | cut -d\" -f2)
+
 # Run PyInstaller to create the build:
 WINEPREFIX=$PREFIX WINEARCH="win32" wine pyinstaller manuskript.spec
 cat build/manuskript/warn-manuskript.txt
@@ -70,10 +72,12 @@ rm api-ms-win-*
 ### comment: Seems to work fine...
 #WINEPREFIX=$PREFIX WINEARCH="win32" wine manuskript.exe
 
+ZIP_NAME=manuskript-$PKG_VERSION-win32.zip
+
 # Package everything together:
 cd ..
-zip -r manuskript.zip manuskript
-mv manuskript.zip $EXEC_DIR
+zip -r $ZIP_NAME manuskript
+mv $ZIP_NAME $EXEC_DIR
 
 # Cleanup everything:
 ### comment: removing the local git repository 
diff --git a/package/create_rpm.sh b/package/create_rpm.sh
index 47300b57..ed614bdf 100755
--- a/package/create_rpm.sh
+++ b/package/create_rpm.sh
@@ -56,7 +56,8 @@ echo_do eval "mkdir -p $Dest/$AppName-$AppVersion/{usr/share/applications,usr/bi
 
 echo "### Copying manuskript content"
 echo_do eval "rsync -a --exclude=.git --include='*.msk' \
-    --exclude-from='$Root/.gitignore' \
+    --exclude=.github \
+	--exclude-from='$Root/.gitignore' \
     --exclude=rpmbuild \
     --exclude={.codeclimate.yml,.gitignore,.travis.yml} \
     $ScriptPath/../  $Dest/$AppName-$AppVersion/usr/share/manuskript"
diff --git a/package/prepare_linux.sh b/package/prepare_linux.sh
index 458d9262..61dc07e5 100755
--- a/package/prepare_linux.sh
+++ b/package/prepare_linux.sh
@@ -5,7 +5,7 @@ sudo apt-get -qq install python3-pip python3-dev \
      build-essential qt5-default libxml2-dev libxslt1-dev \
      mesa-utils libgl1-mesa-glx libgl1-mesa-dev
 
-pyenv local 3.6.7
-python --version
-easy_install pip
-pip install pyqt5==5.9 lxml pytest pytest-faulthandler
+#pyenv local 3.6.7
+python3 --version
+#easy_install pip
+pip install pyqt5 lxml pytest pytest-faulthandler