Makefile: Allow overriding directories without having to know the DESTDIR

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

diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index f26e37691c14bd49d43a6e4e92c905d23b9bc898..930a6732169083feb28b4756cf7a9bac6dbb1d88 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)
 #
-version = "1.0.0"
+version = "1.3.0"
 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",
+                       "xdg_data_home",
                        "waydroid_data",
                        "xdg_runtime_dir",
                        "wayland_display",
@@ -38,10 +39,11 @@ session_config_keys = ["user_name",
 # overridden on the commandline)
 defaults = {
     "arch": "arm64",
-    "work": "/home/.waydroid",
+    "work": "/var/lib/waydroid",
     "vendor_type": "MAINLINE",
     "system_datetime": "0",
-    "vendor_datetime": "0"
+    "vendor_datetime": "0",
+    "preinstalled_images_path": "/usr/share/waydroid-extra/images"
 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"
@@ -54,6 +56,7 @@ session_defaults = {
     "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')),
@@ -61,15 +64,15 @@ session_defaults = {
     "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",
-    "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"
 }