tools: Upver to 1.3.3

[waydroid.git] / tools / config / __init__.py

diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index f1bde16eddac1c909999d129734f69c7981f5040..e88998510054558d55912ace0629cbb3aed4f4e1 100644 (file)
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -12,7 +12,7 @@ from tools.config.save import save, save_session
 #
 # Exported variables (internal configuration)
 #
 #
 # Exported variables (internal configuration)
 #

-version = "1.0.0"
+version = "1.3.3"

 tools_src = os.path.normpath(os.path.realpath(__file__) + "/../../..")
 
 # Keys saved in the config file (mostly what we ask in 'waydroid init')
 tools_src = os.path.normpath(os.path.realpath(__file__) + "/../../..")
 
 # Keys saved in the config file (mostly what we ask in 'waydroid init')


@@ -26,6 +26,7 @@ session_config_keys = ["user_name",
                        "user_id",
                        "group_id",
                        "host_user",
                        "user_id",
                        "group_id",
                        "host_user",

+                       "xdg_data_home",

                        "waydroid_data",
                        "xdg_runtime_dir",
                        "wayland_display",
                        "waydroid_data",
                        "xdg_runtime_dir",
                        "wayland_display",


@@ -42,7 +43,10 @@ defaults = {
     "vendor_type": "MAINLINE",
     "system_datetime": "0",
     "vendor_datetime": "0",
     "vendor_type": "MAINLINE",
     "system_datetime": "0",
     "vendor_datetime": "0",

-    "preinstalled_images_path": "/usr/share/waydroid-extra/images"
+    "preinstalled_images_paths": [
+        "/etc/waydroid-extra/images",
+        "/usr/share/waydroid-extra/images",
+    ]

 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"
 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"


@@ -55,6 +59,7 @@ session_defaults = {
     "user_id": str(os.getuid()),
     "group_id": str(os.getgid()),
     "host_user": os.path.expanduser("~"),
     "user_id": str(os.getuid()),
     "group_id": str(os.getgid()),
     "host_user": os.path.expanduser("~"),

+    "xdg_data_home": str(os.environ.get('XDG_DATA_HOME', os.path.expanduser("~") + "/.local/share")),

     "xdg_runtime_dir": str(os.environ.get('XDG_RUNTIME_DIR')),
     "wayland_display": str(os.environ.get('WAYLAND_DISPLAY')),
     "pulse_runtime_path": str(os.environ.get('PULSE_RUNTIME_PATH')),
     "xdg_runtime_dir": str(os.environ.get('XDG_RUNTIME_DIR')),
     "wayland_display": str(os.environ.get('WAYLAND_DISPLAY')),
     "pulse_runtime_path": str(os.environ.get('PULSE_RUNTIME_PATH')),


@@ -62,15 +67,15 @@ session_defaults = {
     "lcd_density": "0"
 }
 session_defaults["config_path"] = defaults["work"] + "/session.cfg"
     "lcd_density": "0"
 }
 session_defaults["config_path"] = defaults["work"] + "/session.cfg"

-session_defaults["waydroid_data"] = session_defaults["host_user"] + \
+session_defaults["waydroid_data"] = session_defaults["xdg_data_home"] + \

     "/waydroid/data"
 if session_defaults["pulse_runtime_path"] == "None":
     session_defaults["pulse_runtime_path"] = session_defaults["xdg_runtime_dir"] + "/pulse"
 
 channels_defaults = {
     "config_path": "/usr/share/waydroid-extra/channels.cfg",
     "/waydroid/data"
 if session_defaults["pulse_runtime_path"] == "None":
     session_defaults["pulse_runtime_path"] = session_defaults["xdg_runtime_dir"] + "/pulse"
 
 channels_defaults = {
     "config_path": "/usr/share/waydroid-extra/channels.cfg",

-    "system_channel": "https://raw.githubusercontent.com/waydroid/OTA/master/system",
-    "vendor_channel": "https://raw.githubusercontent.com/waydroid/OTA/master/vendor",
+    "system_channel": "https://ota.waydro.id/system",
+    "vendor_channel": "https://ota.waydro.id/vendor",

     "rom_type": "lineage",
     "system_type": "VANILLA"
 }
     "rom_type": "lineage",
     "system_type": "VANILLA"
 }