fix stopvnc

hardcoded dialogs

Author: SaicharanKandukuri

main.py

@@ -14,10 +14,7 @@ def vnc_mode(port=1,mode="start",xstartup=os.getenv('HOME')+"/.vnc/xstartup"):
             else:
                 print(vncrunningdialog(port))
         elif mode == "stop":
-            if vnc.stopvnc(port):
-                print(vnckilldialog(port))
-            else:
-                print("No VNC server running at "+str(port))
+            vnc.stopvnc(port)
     else:
         print("xstartup file not found")
 

utils/info.py

@@ -21,6 +21,3 @@ def vncrunningdialog(port):
         +green("vncserver -kill :"+str(port))\
         +" or "+blue("stopvnc")
 
-def vnckilldialog(port):
-    return "vncserver stopped on "+str(LOCALIP)+" port "+str(port)
-

utils/vnc.py

@@ -1,5 +1,7 @@
 import os
 
+from utils.funs import nmsg
+
 DISPLAY=os.getenv('DISPLAY')
 VNC_LOCK_TYPE="/tmp/X11-unix/X"
 
@@ -36,9 +38,12 @@ def stopvnc(port:int) -> bool:
         port = int(os.getenv('DEFAULT_VNC_PORT'))
 
     if isvncstarted(port):
-        if os.WEXITSTATUS(os.system("vncserver -kill :"+str(port))) == 0:
-            return True
-        else:
-            return False
+        os.WEXITSTATUS(os.system("vncserver -kill :"+str(port)))
+        nmsg("Cleaning Lock File")
+        if os.path.exists(VNC_LOCK_TYPE+str(port)):
+            os.remove(VNC_LOCK_TYPE+str(port))
+        if os.path.exists("/tmp/X"+str(port)+"-lock"):
+            os.remove("/tmp/X"+str(port)+"-lock")
+        nmsg("VNC Server Stopped")
     else:
-        return False
+        nmsg("VNC Server not started at "+str(port))