From 49b23c6bbd547f4cf2788351799287b59885ca9d Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 14 May 2015 21:24:19 +0200 Subject: [PATCH] Prepend target directory in $XDG_CACHE_HOME --- Xsession.d/25unburden-home-dir-xdg | 2 +- t/xsession-d-xdg.t | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Xsession.d/25unburden-home-dir-xdg b/Xsession.d/25unburden-home-dir-xdg index f964c76..df27ab6 100644 --- a/Xsession.d/25unburden-home-dir-xdg +++ b/Xsession.d/25unburden-home-dir-xdg @@ -12,7 +12,7 @@ fi if unburden_it; then if [ -z "$XDG_CACHE_HOME" ]; then - XDG_CACHE_HOME="$(echo "$FILELAYOUT" | sed -e "s/%u/$USER/;s/%s/cache/")" + XDG_CACHE_HOME="$TARGETDIR/$(echo "$FILELAYOUT" | sed -e "s/%u/$USER/;s/%s/cache/")" export XDG_CACHE_HOME fi fi diff --git a/t/xsession-d-xdg.t b/t/xsession-d-xdg.t index 1b740c4..d2a3da9 100644 --- a/t/xsession-d-xdg.t +++ b/t/xsession-d-xdg.t @@ -19,6 +19,7 @@ my ($cmd, $wanted, $output, $stderr); # Set a debug environment $ENV{PATH} = "$BINDIR:/bin"; # /bin needed for sed $ENV{UNBURDEN_BASENAME} = $t->BASENAME; +$ENV{TARGETDIR} = '.'; delete $ENV{XDG_CACHE_HOME}; $t->setup_test_environment_without_target(''); @@ -41,7 +42,7 @@ $t->eq_or_diff_stdout("$XSESSIOND/$RPSCRIPT\n", "run-parts STDOUT"); $t->call_cmd("/bin/sh -c '. $XSESSIOND/$RPSCRIPT; echo \$XDG_CACHE_HOME'"); $t->eq_or_diff_stderr('', "Xsession.d STDERR is empty"); -$t->eq_or_diff_stdout($t->TARGET."/cache\n", "XDG_CACHE_HOME is set"); +$t->eq_or_diff_stdout($ENV{TARGETDIR}.'/'.$t->TARGET."/cache\n", "XDG_CACHE_HOME is set"); ok( write_file($t->HOME.'/.'.$t->BASENAME, "UNBURDEN_HOME=no\n"), "Configure Xsession.d script to NOT run unburden-home-dir" );