Remove slashes that cause problems when unpacking files with

relative paths (bug #196565) (trunk r8200)

svn path=/main/branches/2.1.2/; revision=8231

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 4e98b6474a203815b808b5c26dfab30cedd16c09..c434c9ba2352426653ad2d71abaa523298f7375f 100755 (executable)
--- 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