Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
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"
fi
Comment thread
ymcx marked this conversation as resolved.
Outdated

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

Expand Down
6 changes: 3 additions & 3 deletions test/system/libs/helpers.bash
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