wok-current rev 22456

get-palemoon: do not force decompression type (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Dec 26 12:26:59 2019 +0100 (2019-12-26)
parents fa07719ef62f
children 71aed96e697c
files get-OpenOffice3/stuff/get-OpenOffice3 get-bitcoin/stuff/get-bitcoin get-litecoin/stuff/get-litecoin get-palemoon/stuff/get-palemoon get-playonlinux/stuff/get-playonlinux get-rar/stuff/get-rar get-scilab/stuff/get-scilab get-softmodem-driver/stuff/get-softmodem-driver get-sublime-text-3/stuff/get-sublime-text-3 get-unace/stuff/get-unace get-wifi-firmware/stuff/get-wifi-firmware
line diff
     1.1 --- a/get-OpenOffice3/stuff/get-OpenOffice3	Thu Dec 26 11:06:02 2019 +0000
     1.2 +++ b/get-OpenOffice3/stuff/get-OpenOffice3	Thu Dec 26 12:26:59 2019 +0100
     1.3 @@ -120,7 +120,7 @@
     1.4  # Creates TEMP_DIR and extract tarball
     1.5  mkdir -p $TEMP_DIR
     1.6  echo -n "Extract files from archive..."
     1.7 -tar xvzf $SOURCE_DIR/$TARBALL -C $TEMP_DIR > $LOG 2>&1 || \
     1.8 +busybox tar xvf $SOURCE_DIR/$TARBALL -C $TEMP_DIR > $LOG 2>&1 || \
     1.9   (echo "Failed to extract $TARBALL" ; exit 1)
    1.10  status
    1.11  

     2.1 --- a/get-bitcoin/stuff/get-bitcoin	Thu Dec 26 11:06:02 2019 +0000
     2.2 +++ b/get-bitcoin/stuff/get-bitcoin	Thu Dec 26 12:26:59 2019 +0100
     2.3 @@ -41,7 +41,7 @@
     2.4  fi
     2.5  
     2.6  mkdir -p $PACKAGE-$VERSION/fs/usr/bin
     2.7 -tar xzf $FILE
     2.8 +busybox tar xf $FILE
     2.9  
    2.10  mv $PACKAGE-$VERSION-linux/bin/32/* $PACKAGE-$VERSION/fs/usr/bin
    2.11  rm -rf $PACKAGE-$VERSION-linux

     3.1 --- a/get-litecoin/stuff/get-litecoin	Thu Dec 26 11:06:02 2019 +0000
     3.2 +++ b/get-litecoin/stuff/get-litecoin	Thu Dec 26 12:26:59 2019 +0100
     3.3 @@ -40,7 +40,7 @@
     3.4  fi
     3.5  
     3.6  mkdir -p $PACKAGE-$VERSION/fs/usr/bin
     3.7 -tar xzf $FILE
     3.8 +busybox tar xf $FILE
     3.9  
    3.10  mv $PACKAGE-$VERSION-linux/bin/32/* $PACKAGE-$VERSION/fs/usr/bin
    3.11  rm -rf $PACKAGE-$VERSION-linux

     4.1 --- a/get-palemoon/stuff/get-palemoon	Thu Dec 26 11:06:02 2019 +0000
     4.2 +++ b/get-palemoon/stuff/get-palemoon	Thu Dec 26 12:26:59 2019 +0100
     4.3 @@ -9,7 +9,8 @@
     4.4  sed '/i686/!d;s/.*href="\([^"]*\).*/\1/;q')"
     4.5  VERSION="$(echo $WGET_URL | sed 's/.*palemoon-\([0-9\.]*\)\..*/\1/')"
     4.6  
     4.7 -mkdir -p $1/opt; cd $1/opt; busybox wget -O - $WGET_URL | tar -xf -
     4.8 +# busybox tar autodetect compression type
     4.9 +mkdir -p $1/opt; cd $1/opt; busybox wget -O - $WGET_URL | busybox tar -xf -
    4.10  
    4.11  ################
    4.12  DESKTOP=usr/share/applications/$PACKAGE.desktop

     5.1 --- a/get-playonlinux/stuff/get-playonlinux	Thu Dec 26 11:06:02 2019 +0000
     5.2 +++ b/get-playonlinux/stuff/get-playonlinux	Thu Dec 26 12:26:59 2019 +0100
     5.3 @@ -7,7 +7,7 @@
     5.4  URL=http://www.playonlinux.com/$(. /etc/locale.conf ; echo ${LANG%_*})/download.html
     5.5  busybox wget -s $URL || URL=http://www.playonlinux.com/en/download.html
     5.6  URL=$(wget -O - $URL | sed '/z2*"/!d;s/.*ref="\([^"]*\).*/\1/')
     5.7 -wget -O - $URL | tar xzf -
     5.8 +wget -O - $URL | busybox tar xf -
     5.9  for i in bash wxpython cabextract imagemagick gnupg wine wget icoutils \
    5.10  	 p7zip-full gnu-netcat grep; do
    5.11  	[ -d /var/lib/tazpkg/installed/$i/ ] || tazpkg get-install $i

     6.1 --- a/get-rar/stuff/get-rar	Thu Dec 26 11:06:02 2019 +0000
     6.2 +++ b/get-rar/stuff/get-rar	Thu Dec 26 12:26:59 2019 +0100
     6.3 @@ -37,7 +37,7 @@
     6.4  fi
     6.5  
     6.6  # Extract
     6.7 -tar xzf $TARBALL
     6.8 +busybox tar xf $TARBALL
     6.9  
    6.10  # Install files
    6.11  dir=$PACKAGE-$VERSION/fs/usr/bin

     7.1 --- a/get-scilab/stuff/get-scilab	Thu Dec 26 11:06:02 2019 +0000
     7.2 +++ b/get-scilab/stuff/get-scilab	Thu Dec 26 12:26:59 2019 +0100
     7.3 @@ -40,7 +40,7 @@
     7.4  fi
     7.5  
     7.6  mkdir -p $PACKAGE/fs/usr/share
     7.7 -tar xzf $FILE -C $PACKAGE/fs/usr/share
     7.8 +busybox tar xf $FILE -C $PACKAGE/fs/usr/share
     7.9  # extracted pkg can be removed: Save RAM
    7.10  rm -f $FILE
    7.11  

     8.1 --- a/get-softmodem-driver/stuff/get-softmodem-driver	Thu Dec 26 11:06:02 2019 +0000
     8.2 +++ b/get-softmodem-driver/stuff/get-softmodem-driver	Thu Dec 26 12:26:59 2019 +0100
     8.3 @@ -80,6 +80,7 @@
     8.4  *tar.gz|*tgz)	tar xzf $(basename $WGET_URL) || exit 1 ;;
     8.5  *zip)	unzip $(basename $WGET_URL);;
     8.6  *o)	;;
     8.7 +*)	busybox tar xf $(basename $WGET_URL) ;;
     8.8  esac
     8.9  
    8.10  # Set dirs

     9.1 --- a/get-sublime-text-3/stuff/get-sublime-text-3	Thu Dec 26 11:06:02 2019 +0000
     9.2 +++ b/get-sublime-text-3/stuff/get-sublime-text-3	Thu Dec 26 12:26:59 2019 +0100
     9.3 @@ -5,7 +5,7 @@
     9.4  
     9.5  # download tarball and extract
     9.6  rm -rf $1/opt/sublime_text 2>/dev/null
     9.7 -mkdir -p $1/opt; cd $1/opt; busybox wget -O - $WGET_URL | tar -xjf -
     9.8 +mkdir -p $1/opt; cd $1/opt; busybox wget -O - $WGET_URL | busybox tar -xf -
     9.9  cd $1/opt; mv sublime_text_3 sublime_text
    9.10  
    9.11  # move desktop file

    10.1 --- a/get-unace/stuff/get-unace	Thu Dec 26 11:06:02 2019 +0000
    10.2 +++ b/get-unace/stuff/get-unace	Thu Dec 26 12:26:59 2019 +0100
    10.3 @@ -38,7 +38,7 @@
    10.4  fi
    10.5  
    10.6  # Extract
    10.7 -tar xzf $TARBALL
    10.8 +busybox tar xf $TARBALL
    10.9  
   10.10  # extracted pkg can be removed: Save RAM before packing
   10.11  rm -rf $TARBALL

    11.1 --- a/get-wifi-firmware/stuff/get-wifi-firmware	Thu Dec 26 11:06:02 2019 +0000
    11.2 +++ b/get-wifi-firmware/stuff/get-wifi-firmware	Thu Dec 26 12:26:59 2019 +0100
    11.3 @@ -162,6 +162,7 @@
    11.4  *tar.gz|*tgz)	tar xzf $TARBALL;;
    11.5  *zip)	unzip $TARBALL;;
    11.6  *o)	;;
    11.7 +*)	busybox tar xf $TARBALL;;
    11.8  esac
    11.9  	
   11.10  # Create pseudo package