typo fix and remove fifo in login handler

pardus · Jun 11, 2024 · 0c4d858 · 0c4d858
1 parent 61fc93a
commit 0c4d858
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/module/daemon.py b/src/module/daemon.py
@@ -1,18 +1,19 @@
 import json
 @asynchronous
 def module_init():
+    busdir = "/var/lib/lightdm/"
     if os.path.exists("/{}/pardus-greeter".format(busdir)):
         os.unlink("/{}/pardus-greeter".format(busdir))
     if not get("enabled",True,"daemon"):
         return
-    busdir = "/var/lib/lightdm/"
     while True:
         os.mkfifo("/{}/pardus-greeter".format(busdir))
         try:
             with open("/{}/pardus-greeter".format(busdir),"r") as f:
                 username=""
                 password=""
                 data=json.loads(f.read())
+                os.unlink("/{}/pardus-greeter".format(busdir))
                 if "username" in data:
                     username=str(data["username"])
                 if "password" in data:
@@ -24,5 +25,6 @@ def module_init():
                 lightdm.set(username, password)
                 lightdm.login()
         except Exception as e:
+           if os.path.exists("/{}/pardus-greeter".format(busdir)):
+               os.unlink("/{}/pardus-greeter".format(busdir))
            print(traceback.format_exc(), file=sys.stderr)
-        os.unlink("/{}/pardus-greeter".format(busdir))
diff --git a/src/module/gtkwindow.py b/src/module/gtkwindow.py
@@ -173,6 +173,10 @@ def login_handler(self):
             gsettings_set("last-username", lightdm.get_username())
             gsettings_set("last-session", lightdm.get_session())
 
+        busdir = "/var/lib/lightdm/"
+        if os.path.exists("/{}/pardus-greeter".format(busdir)):
+            os.unlink("/{}/pardus-greeter".format(busdir))
+
         self.kill_windowmanager()