user_manager: Use one variable for apps dir

fixes #109

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index 662fb2a521f5f5ed5f2f03b057fbaa6c7f807bfb..fc6552b7a986fe29f76c7a66b12f04c6a679fcde 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -9,6 +9,7 @@ from tools.interfaces import IPlatform
 
 
 def start(args, unlocked_cb=None):
 
 
 def start(args, unlocked_cb=None):

+

     def makeDesktopFile(appInfo):
         showApp = False
         for cat in appInfo["categories"]:
     def makeDesktopFile(appInfo):
         showApp = False
         for cat in appInfo["categories"]:


@@ -19,8 +20,7 @@ def start(args, unlocked_cb=None):
         
         packageName = appInfo["packageName"]
 
         
         packageName = appInfo["packageName"]
 

-        desktop_file_path = args.host_user + \
-            "/.local/share/applications/waydroid." + packageName + ".desktop"
+        desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"

         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])
         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])


@@ -34,8 +34,7 @@ def start(args, unlocked_cb=None):
             return 0
 
     def makeWaydroidDesktopFile(hide):
             return 0
 
     def makeWaydroidDesktopFile(hide):

-        desktop_file_path = args.host_user + \
-            "/.local/share/applications/Waydroid.desktop"
+        desktop_file_path = args.apps_dir + "/Waydroid.desktop"

         if os.path.isfile(desktop_file_path):
             os.remove(desktop_file_path)
         lines = ["[Desktop Entry]", "Type=Application"]
         if os.path.isfile(desktop_file_path):
             os.remove(desktop_file_path)
         lines = ["[Desktop Entry]", "Type=Application"]


@@ -55,13 +54,13 @@ def start(args, unlocked_cb=None):
         session_cfg = tools.config.load_session()
         args.waydroid_data = session_cfg["session"]["waydroid_data"]
         args.host_user = session_cfg["session"]["host_user"]
         session_cfg = tools.config.load_session()
         args.waydroid_data = session_cfg["session"]["waydroid_data"]
         args.host_user = session_cfg["session"]["host_user"]

+        args.apps_dir = args.host_user + "/.local/share/applications/"

 
         platformService = IPlatform.get_service(args)
         if platformService:
 
         platformService = IPlatform.get_service(args)
         if platformService:

-            apps_dir = "/.local/share/applications"
-            if not os.path.exists(apps_dir):
-                os.mkdir(apps_dir)
-                os.chmod(apps_dir, 0o700)
+            if not os.path.exists(args.apps_dir):
+                os.mkdir(args.apps_dir)
+                os.chmod(args.apps_dir, 0o700)

             appsList = platformService.getAppsInfo()
             for app in appsList:
                 makeDesktopFile(app)
             appsList = platformService.getAppsInfo()
             for app in appsList:
                 makeDesktopFile(app)


@@ -77,8 +76,7 @@ def start(args, unlocked_cb=None):
         platformService = IPlatform.get_service(args)
         if platformService:
             appInfo = platformService.getAppInfo(packageName)
         platformService = IPlatform.get_service(args)
         if platformService:
             appInfo = platformService.getAppInfo(packageName)

-            desktop_file_path = args.host_user + \
-                "/.local/share/applications/" + packageName + ".desktop"
+            desktop_file_path = args.apps_dir + "/" + packageName + ".desktop"

             if mode == 0:
                 # Package added
                 makeDesktopFile(appInfo)
             if mode == 0:
                 # Package added
                 makeDesktopFile(appInfo)