CLI-1191: Support XDG Base Dir

acquia · Oct 31, 2023 · 1cf96fd · 1cf96fd
1 parent b1a1914
commit 1cf96fd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/bin/acli b/bin/acli
@@ -60,6 +60,9 @@ $input = new ArgvInput();
 if (!getenv('HOME')) {
     putenv('HOME=' . LocalMachineHelper::getHomeDir());
 }
+if (!getenv('ACLI_HOME')) {
+  putenv('ACLI_HOME=' . LocalMachineHelper::getConfigDir());
+}
 $kernel = new Kernel('prod', false);
 
 // Handle a clear-kernel-cache pseudo command. This isn't implemented as a true console

diff --git a/config/prod/services.yml b/config/prod/services.yml
@@ -1,7 +1,7 @@
 ---
 parameters:
   env(ACLI_REPO_ROOT): "%kernel.project_dir%"
-  app.data_dir: "%env(HOME)%/.acquia"
+  app.data_dir: "%env(ACLI_HOME)%"
   app.project_dir: "%env(ACLI_REPO_ROOT)%"
   app.ssh_dir: "%env(HOME)%/.ssh"
   app.acli_config_filename: '.acquia-cli.yml'

diff --git a/src/Helpers/LocalMachineHelper.php b/src/Helpers/LocalMachineHelper.php
@@ -236,6 +236,18 @@ public static function getHomeDir(): string {
     return $home;
   }
 
+  public static function getConfigDir(): string {
+    $home = self::getHomeDir();
+    $legacyDir = Path::join($home, '.acquia');
+    if (file_exists($legacyDir)) {
+      return $legacyDir;
+    }
+    if ($xdgHome = getenv('XDG_CONFIG_HOME')) {
+      return Path::join($xdgHome, 'acquia');
+    }
+    return Path::join($home, '.config', 'acquia');
+  }
+
   /**
    * Get the project root directory for the working directory.
    *