Allow ~/.config/bb_clientd subdirectory

When having multiple configuration files, the ~/.config directory gets
cleaner when they are all gathered in the subdirectory bb_clientd. Keep
the old behaviour with files straight in ~/.config for backwards
compatibility.

Author: moroten

README.md

@@ -78,8 +78,9 @@ journalctl --user -u bb_clientd -f
 
 By default, bb\_clientd will use the configuration file that is also
 shipped with this repository. It is possible to override configuration
-options by creating a file named `~/.config/bb_clientd.jsonnet` that
-uses the following structure:
+options by creating a file named `~/.config/bb_clientd.jsonnet` or
+`~/.config/bb_clientd/bb_clientd.jsonnet` that uses the following
+structure:
 
 ```jsonnet
 local defaultConfiguration = import 'bb_clientd_defaults.jsonnet';

configs/linux/launch_bb_clientd_linux.sh

@@ -23,9 +23,19 @@ if [ "$1" = "start" ]; then
   # Use either the user provided or system-wide configuration file, based
   # on whether the former is present.
   config_file=/usr/lib/bb_clientd/bb_clientd.jsonnet
-  personal_config_file="${HOME}/.config/bb_clientd.jsonnet"
+  personal_config_file="${HOME}/.config/bb_clientd/bb_clientd.jsonnet"
+
+  # TODO: 2025-04-08 Remove migration code after a year.
+  old_personal_config_file="${HOME}/.config/bb_clientd.jsonnet"
+  if [ -f "$old_personal_config_file" ]; then
+    echo "Found ${old_personal_config_file}, moving it to ${personal_config_file}"
+    mkdir -p "${HOME}/.config/bb_clientd"
+    mv "$old_personal_config_file" "$personal_config_file"
+    rm -f "${HOME}/.config/bb_clientd_defaults.jsonnet"
+  fi
+
   if [ -f "${personal_config_file}" ]; then
-    ln -sf "${config_file}" "${HOME}/.config/bb_clientd_defaults.jsonnet"
+    ln -sf "${config_file}" "${HOME}/.config/bb_clientd/bb_clientd_defaults.jsonnet"
     config_file="${personal_config_file}"
   fi