Fix User Name with Spaces

Author: Skazza94

scripts/Linux/Makefile

@@ -1,23 +1,20 @@
 #!/usr/bin/make -f
 
-VERSION=2.0.6
-DEBIAN_PACKAGE_VERSION=6
+VERSION=2.0.7
+DEBIAN_PACKAGE_VERSION=1
 LAUNCHPAD_NAME=user
 
 ARCHITECTURE:=$(shell dpkg --print-architecture)
 
-.PHONY: allSigned docker-unsigned docker-signed-bionic docker-signed-disco docker-build-image prepare-deb-source unpack-deb-source clean-output-folder copy-debian-folder download-pip build-man build-deb-unsigned build-deb-signed-bionic build-deb-signed-disco ppa deps clean
+.PHONY: allSigned docker-unsigned docker-signed_% docker-build-image prepare-deb-source unpack-deb-source clean-output-folder copy-debian-folder download-pip build-man build-deb-unsigned build-deb-signed ppa deps clean
 
-allSigned: clean prepare-deb-source clean-output-folder docker-signed-bionic docker-signed-disco
+allSigned: clean prepare-deb-source docker-signed_bionic docker-signed_disco
 
 docker-unsigned: docker-build-image
 	docker run -ti --rm -v `pwd`/../../:/opt/kathara kathara/linux-build /bin/bash -c "make build-deb-unsigned"
 
-docker-signed-bionic: docker-build-image
-	docker run -ti --rm -v $(HOME)/.gnupg:/root/.gnupg -v `pwd`/../../:/opt/kathara kathara/linux-build /bin/bash -c "make unpack-deb-source && make build-deb-signed-bionic && make ppa && make clean-output-folder"
-
-docker-signed-disco: docker-build-image
-	docker run -ti --rm -v $(HOME)/.gnupg:/root/.gnupg -v `pwd`/../../:/opt/kathara kathara/linux-build /bin/bash -c "make unpack-deb-source && make build-deb-signed-disco && make ppa && make clean-output-folder"
+docker-signed_%:
+	docker run -ti --rm -v $(HOME)/.gnupg:/root/.gnupg -v `pwd`/../../:/opt/kathara kathara/linux-build /bin/bash -c "make unpack-deb-source && make build-deb-signed distro=$* && make ppa && make clean-output-folder distro=$*"
 
 docker-build-image:
 	cd Docker-Linux-Build && docker build -t kathara/linux-build .
@@ -32,11 +29,11 @@ unpack-deb-source:
 
 clean-output-folder:
 	rm -rf Output/kathara-$(VERSION)
-	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION).debian.tar.xz
-	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION).dsc
-	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)_source.build
-	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)_source.buildinfo
-	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)_source.changes
+	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)$(distro).debian.tar.xz
+	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)$(distro).dsc
+	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)$(distro)_source.build
+	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)$(distro)_source.buildinfo
+	rm -rf Output/kathara_$(VERSION)-$(DEBIAN_PACKAGE_VERSION)$(distro)_source.changes
 
 copy-debian-folder: 
 	cp -r debian Output/kathara-$(VERSION)/
@@ -60,12 +57,8 @@ build-deb-unsigned: build-man download-pip
 	sed -i -e 's/__UBUNTU_VERSION__/bionic/g' Output/kathara-$(VERSION)/debian/changelog
 	cd Output/kathara-$(VERSION); debuild -us -uc
 
-build-deb-signed-bionic: build-man download-pip
-	sed -i -e 's/__UBUNTU_VERSION__/bionic/g' Output/kathara-$(VERSION)/debian/changelog
-	cd Output/kathara-$(VERSION); debuild -S -sa
-
-build-deb-signed-disco: build-man download-pip
-	sed -i -e 's/__UBUNTU_VERSION__/disco/g' Output/kathara-$(VERSION)/debian/changelog
+build-deb-signed: build-man download-pip
+	sed -i -e 's/__UBUNTU_VERSION__/$(distro)/g' Output/kathara-$(VERSION)/debian/changelog
 	cd Output/kathara-$(VERSION); debuild -S -sa
 
 ppa:
@@ -77,5 +70,5 @@ deps:
 
 clean:
 	if [ -d Output ]; then \
-		rm -r Output; \
+		rm -rf Output; \
 	fi

scripts/Linux/debian/changelog

@@ -1,5 +1,5 @@
 kathara (__VERSION__-__DEBIAN_PACKAGE_VERSION____UBUNTU_VERSION__) __UBUNTU_VERSION__; urgency=low
 
-  * The upload is now done with real source
+  * Current User Name (used for Docker Container name) is slugified to avoid spaces and special chars.
 
- -- Lorenzo Ariemma <l******************a@gmail.com>  __DATE__
+ -- Mariano Scazzariello <***@gmail.com>  __DATE__

scripts/OSX/Makefile

@@ -1,7 +1,7 @@
 #!/usr/bin/make -s
 
 PRODUCT=Kathara
-VERSION=2.0.6
+VERSION=2.0.7
 TARGET_DIRECTORY=Output
 APPLE_DEVELOPER_CERTIFICATE_ID=FakeID
 ROFF_DIR=../../docs/Roff

scripts/Windows/installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Kathara"
-#define MyAppVersion "2.0.6"
+#define MyAppVersion "2.0.7"
 #define MyAppPublisher "Kathara Team"
 #define MyAppURL "http://www.kathara.org"
 #define MyAppExeName "kathara.exe"

src/Resources/utils.py

@@ -5,14 +5,15 @@
 import os
 import re
 import shutil
-import sys
 import tarfile
 import tempfile
 from io import BytesIO
 from itertools import islice
-from sys import platform as _platform
 
+import sys
 from binaryornot.check import is_binary
+from slugify import slugify
+from sys import platform as _platform
 
 from .setting.Setting import EXCLUDED_FILES
 from .trdparty.consolemenu import PromptUtils, Screen
@@ -175,7 +176,7 @@ def windows():
         import getpass
         return getpass.getuser()
 
-    return exec_by_platform(unix, windows, unix)
+    return slugify(exec_by_platform(unix, windows, unix))
 
 
 def get_current_user_info():

src/Resources/version.py

@@ -1,4 +1,4 @@
-CURRENT_VERSION = "2.0.6"
+CURRENT_VERSION = "2.0.7"
 
 
 def parse(version):

src/requirements.txt

@@ -3,5 +3,6 @@ docker>=4.0.2;
 coloredlogs>=10.0;
 terminaltables>=3.1.0;
 requests>=2.22.0;
+python-slugify>=4.0.0;
 appscript>=1.1.0; sys_platform == 'darwin'
 pypiwin32>=223; sys_platform == 'win32'