From 2ec732a2e99e4fb2b248ef034df35a03d3dca273 Mon Sep 17 00:00:00 2001 From: Alejandro R Mosteo Date: Mon, 11 Mar 2024 12:49:39 +0100 Subject: [PATCH] More conventional location for settings in Windows (#1624) To avoid mixing top levels, also nest the cache too. --- src/alire/os_windows/alire-platforms-folders__windows.adb | 8 +++++--- testsuite/drivers/alr.py | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/alire/os_windows/alire-platforms-folders__windows.adb b/src/alire/os_windows/alire-platforms-folders__windows.adb index 2cd1d4d1..f2f2dc7b 100644 --- a/src/alire/os_windows/alire-platforms-folders__windows.adb +++ b/src/alire/os_windows/alire-platforms-folders__windows.adb @@ -18,14 +18,16 @@ package body Alire.Platforms.Folders is ----------- function Cache return Absolute_Path - is (OS_Lib.Getenv ("LocalAppData", Home / ".local" / "share") - / "alire"); + is (OS_Lib.Getenv ("LocalAppData", Home / "AppData" / "Local") + / "alire" / "cache"); ------------ -- Config -- ------------ - function Config return Absolute_Path is (Home / ".config" / "alire"); + function Config return Absolute_Path + is (OS_Lib.Getenv ("LocalAppData", Home / "AppData" / "Local") + / "alire" / "settings"); ---------- -- Temp -- diff --git a/testsuite/drivers/alr.py b/testsuite/drivers/alr.py index 809e968f..1a611a68 100644 --- a/testsuite/drivers/alr.py +++ b/testsuite/drivers/alr.py @@ -56,7 +56,8 @@ def prepare_env(config_dir, env): # tests that need it. run_alr("-c", config_dir, "settings", "--global", "--set", "msys2.install_dir", - os.path.join(os.environ.get("LocalAppData"), "alire", "msys64")) + os.path.join( + os.environ.get("LocalAppData"), "alire", "cache", "msys64")) # Disable autoconfig of the community index, to prevent unintended use of # it in tests, besides the overload of fetching it -- 2.39.5