Skip to content

Migrate the config directory from ~/.config/toolbox to ~/.config/toolbx #1812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ymcx wants to merge 4 commits into
base: main
Choose a base branch
from
+12 −5
Open

Migrate the config directory from ~/.config/toolbox to ~/.config/toolbx #1812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec11318
replace $HOME/.config with $XDG_CONFIG_HOME in test/system/libs/helpe…
Jun 28, 2026
bc7f5c7
migrate from ~/.config/toolbox to ~/.config/toolbx
Jun 28, 2026
ab0e502
make the go codebase adhere to the new config directory
Jun 28, 2026
254c717
fix POSIX compatibility & redirect config dir migration mv's stderr o…
Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion profile.d/toolbox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
[ "${BASH_VERSION:-}" != "" ] || [ "${ZSH_VERSION:-}" != "" ] || return 0
[ "$PS1" != "" ] || return 0

toolbox_config="${XDG_CONFIG_HOME:-$HOME/.config}/toolbox"
root_config="${XDG_CONFIG_HOME:-$HOME/.config}"
toolbox_config="$root_config/toolbx"
toolbox_config_old="$root_config/toolbox"

if [ -d "$toolbox_config_old" ] && ! [ -e "$toolbox_config" ]; then
mv "$toolbox_config_old" "$toolbox_config" 2>/dev/null
fi

host_welcome_stub="$toolbox_config/host-welcome-shown"
toolbox_welcome_stub="$toolbox_config/toolbox-welcome-shown"

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ func migrate(cmd *cobra.Command, args []string) error {
return errors.New("failed to get the user config directory")
}

toolboxConfigDir := configDir + "/toolbox"
toolboxConfigDir := configDir + "/toolbx"
stampPath := toolboxConfigDir + "/podman-system-migrate"
logrus.Debugf("Toolbx config directory is %s", toolboxConfigDir)

Expand Down
6 changes: 3 additions & 3 deletions test/system/libs/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ function _setup_docker_registry() {
assert_success

# Add certificate to Podman's trusted certificates (rootless)
run mkdir -p "$HOME"/.config/containers/certs.d/"${DOCKER_REG_URI}"
run mkdir -p "$XDG_CONFIG_HOME"/containers/certs.d/"${DOCKER_REG_URI}"
assert_success
run cp "${DOCKER_REG_CERTS_DIR}"/domain.crt "$HOME"/.config/containers/certs.d/"${DOCKER_REG_URI}"/domain.crt
run cp "${DOCKER_REG_CERTS_DIR}"/domain.crt "$XDG_CONFIG_HOME"/containers/certs.d/"${DOCKER_REG_URI}"/domain.crt
assert_success

# Create a registry user
Expand Down Expand Up @@ -234,7 +234,7 @@ function _clean_docker_registry() {
# Remove Docker registry dir
rm --force --recursive "${DOCKER_REG_ROOT}"
# Remove dir with created registry certificates
rm --force --recursive "$HOME"/.config/containers/certs.d/"${DOCKER_REG_URI}"
rm --force --recursive "$XDG_CONFIG_HOME"/containers/certs.d/"${DOCKER_REG_URI}"
}


Expand Down
Loading