diff --git a/DEBIAN/control b/DEBIAN/control index e61ec52a..ce8dc49c 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -1,5 +1,5 @@ Package: system-installer -Version: 2.1.3 +Version: 2.1.4 Maintainer: Thomas Castleman Homepage: https://github.com/drauger-os-development/system-installer Section: admin diff --git a/usr/bin/system-installer b/usr/bin/system-installer index ca08bd99..e2706794 100755 --- a/usr/bin/system-installer +++ b/usr/bin/system-installer @@ -28,7 +28,7 @@ import de_control.disable as de_disable import de_control.enable as de_enable from os import path ARGC = len(argv) -VERSION = "2.1.3" +VERSION = "2.1.4" HELP = """ system-installer, Version %s diff --git a/usr/share/system-installer/modules/master.py b/usr/share/system-installer/modules/master.py index 57c58676..4a730d23 100755 --- a/usr/share/system-installer/modules/master.py +++ b/usr/share/system-installer/modules/master.py @@ -194,16 +194,16 @@ def set_keyboard(MODEL, LAYOUT, VARIENT): subprocess.Popen(["udevadm", "trigger", "--subsystem-match=input", "--action=change"], stdout=stderr.buffer) - def remove_launcher(USER): + def remove_launcher(USERNAME): """Remove system installer desktop launcher""" try: os.remove("/home/live/Desktop/system-installer.desktop") except FileNotFoundError: try: - os.remove("/home/%s/Desktop/system-installer.desktop" % (USER)) + os.remove("/home/%s/Desktop/system-installer.desktop" % (USERNAME)) except FileNotFoundError: try: - rmtree("/home/%s/.config/xfce4/panel/launcher-3" % (USER)) + rmtree("/home/%s/.config/xfce4/panel/launcher-3" % (USERNAME)) except FileNotFoundError: eprint("""Cannot find launcher for system-installer. User will need to remove manually.""")