From df6c254c316c883a6a36eddfa0b76981b8b0f1a1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 29 Sep 2018 19:14:50 -0400 Subject: test: testenv: Use the correct paths in makepkg.d/librefetch.conf Instead of having librefetch-test.sh do it. --- test/librefetch-test.sh | 2 -- test/testenv | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/librefetch-test.sh b/test/librefetch-test.sh index 4052ce1..22aab8c 100644 --- a/test/librefetch-test.sh +++ b/test/librefetch-test.sh @@ -19,8 +19,6 @@ BUILDDIR="" SRCDEST=$tmpdir/srcdest source ${_librelib_conf_sh_sysconfdir}/makepkg.d/librefetch.conf EOF - sed -i 's,/usr/bin/librefetch,$(which librefetch),' \ - "${_librelib_conf_sh_sysconfdir}/makepkg.d/librefetch.conf" export MAKEPKG_CONF="$XDG_CONFIG_HOME/pacman/makepkg.conf" diff --git a/test/testenv b/test/testenv index f6c19d5..9883e8b 100755 --- a/test/testenv +++ b/test/testenv @@ -57,6 +57,8 @@ export LIBRETOOLS_LIBDIR="$destdir/usr/lib/libretools" export _librelib_conf_sh_sysconfdir="$destdir/etc" export _librelib_conf_sh_pkgconfdir="$destdir/etc/libretools.d" + sed -i 's,/usr/bin/librefetch,$(which librefetch),' \ + "${_librelib_conf_sh_sysconfdir}/makepkg.d/librefetch.conf" # Hack to respect our variables in sudo _sudo() { -- cgit v1.2.2