BUGFIX: Correct extraction paths for .gz, .Z, etc now that we set A properly.
authorChris Larson <clarson@kergoth.com>
Wed, 11 Jun 2003 04:22:40 +0000 (04:22 +0000)
committerChris Larson <clarson@kergoth.com>
Wed, 11 Jun 2003 04:22:40 +0000 (04:22 +0000)
bin/build/oebuild.sh

index 9330427..a4103d2 100644 (file)
@@ -221,29 +221,29 @@ unpack() {
                y="$(echo $x | sed 's:.*\.\(tar\)\.[a-zA-Z0-9]*:\1:')"
                case "${x##*.}" in
                tar) 
-                       tar x --no-same-owner -f ${DL_DIR}/${x} || die "$myfail"
+                       tar x --no-same-owner -f ${x} || die "$myfail"
                        ;;
                tgz) 
-                       tar xz --no-same-owner -f ${DL_DIR}/${x} || die "$myfail"
+                       tar xz --no-same-owner -f ${x} || die "$myfail"
                        ;;
                tbz2) 
-                       tar xj --no-same-owner -f ${DL_DIR}/${x} || die "$myfail"
+                       tar xj --no-same-owner -f ${x} || die "$myfail"
                        ;;
                ZIP|zip) 
-                       unzip -qo ${DL_DIR}/${x} || die "$myfail"
+                       unzip -qo ${x} || die "$myfail"
                        ;;
                gz|Z|z) 
                        if [ "${y}" == "tar" ]; then
-                               tar xz --no-same-owner -f ${DL_DIR}/${x} || die "$myfail"
+                               tar xz --no-same-owner -f ${x} || die "$myfail"
                        else
-                               gzip -dc ${DL_DIR}/${x} > ${x%.*} || die "$myfail"
+                               gzip -dc ${x} > `basename ${x%.*}` || die "$myfail"
                        fi
                        ;;
                bz2) 
                        if [ "${y}" == "tar" ]; then
-                               tar xj --no-same-owner -f ${DL_DIR}/${x} || die "$myfail"
+                               tar xj --no-same-owner -f ${x} || die "$myfail"
                        else
-                               bzip2 -dc ${DL_DIR}/${x} > ${x%.*} || die "$myfail"
+                               bzip2 -dc ${x} > `basename ${x%.*}` || die "$myfail"
                        fi
                        ;;
                *)