From 3059b58c4afa8fc05b59b562c390c40b50437e4e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 22 Oct 2007 20:33:08 +0000 Subject: [PATCH] Remove slashes that cause problems when unpacking files with relative paths (bug #196565) (trunk r8200) svn path=/main/branches/2.1.2/; revision=8231 --- bin/ebuild.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 4e98b6474..c434c9ba2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -481,20 +481,20 @@ unpack() { ;; 7Z|7z) local my_output - my_output="$(7z x -y "${srcdir}/${x}")" + my_output="$(7z x -y "${srcdir}${x}")" if [ $? -ne 0 ]; then echo "${my_output}" >&2 die "$myfail" fi ;; RAR|rar) - unrar x -idq -o+ "${srcdir}/${x}" || die "$myfail" + unrar x -idq -o+ "${srcdir}${x}" || die "$myfail" ;; LHa|LHA|lha|lzh) - lha xfq "${srcdir}/${x}" || die "$myfail" + lha xfq "${srcdir}${x}" || die "$myfail" ;; a|deb) - ar x "${srcdir}/${x}" || die "$myfail" + ar x "${srcdir}${x}" || die "$myfail" ;; lzma) if [ "${y}" == "tar" ]; then -- 2.26.2