Skip to content

Commit

Permalink
fix bug affecting user setup
Browse files Browse the repository at this point in the history
  • Loading branch information
Batcastle committed Oct 28, 2021
1 parent eb1f546 commit 25089ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: system-installer
Version: 2.1.3
Version: 2.1.4
Maintainer: Thomas Castleman <[email protected]>
Homepage: https://github.com/drauger-os-development/system-installer
Section: admin
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/system-installer
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions usr/share/system-installer/modules/master.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.""")
Expand Down

0 comments on commit 25089ff

Please sign in to comment.