diff --git a/debian/changelog b/debian/changelog index 2298e5b0..5424c1bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ byobu (4.53) unreleased; urgency=low correct prefix * usr/lib/byobu/include/dirs: LP: #780081 - use ~/.local/share/byobu as BYOBU_CONFIG_DIR, if it happens to exist + * usr/lib/byobu/include/dirs: LP: #899271 + - allow explicit BYOBU_CONFIG_DIR selection in ~/.byoburc [ Andrew McCarthy ] * usr/bin/byobu-status: LP: #898801 diff --git a/usr/lib/byobu/include/dirs b/usr/lib/byobu/include/dirs index cdaa70a3..8ca20cd5 100755 --- a/usr/lib/byobu/include/dirs +++ b/usr/lib/byobu/include/dirs @@ -25,7 +25,9 @@ PKG="byobu" [ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr" # Create and export the user configuration directory -if [ -d "$XDG_CONFIG_HOME" ]; then +if [ -d "$BYOBU_CONFIG_DIR" ]; then + export BYOBU_CONFIG_DIR="$BYOBU_CONFIG_DIR" +elif [ -d "$XDG_CONFIG_HOME" ]; then # Use XDG, as some users insist on such nonsense :-) export BYOBU_CONFIG_DIR="$XDG_CONFIG_HOME/$PKG" elif [ -d "$HOME/.local/share/$PKG" ]; then