get-scripts rev 63

Add nanozip
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Aug 10 14:15:08 2016 +0200 (2016-08-10)
parents 35a7d83513d2
children c2d95308d39b
files FoxitReader apk-studio b43-firmware bitcoin btsync cpp2 dropbox exploit_suggester firefox-official flash-plugin gcc2 gcc272 geogebra jad javajre jd-gui kiwix libreoffice nanozip openoffice3 opera palemoon speedtouch-firmware sublime-text-3 teamviewer ueagle-firmware vivaldi
line diff
     1.1 --- a/FoxitReader	Tue Aug 02 09:28:45 2016 +0200
     1.2 +++ b/FoxitReader	Wed Aug 10 14:15:08 2016 +0200
     1.3 @@ -20,7 +20,7 @@
     1.4  done
     1.5  
     1.6  wget $WGET_URL
     1.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
     1.8 +[ -f $TARBALL ] || abort_package
     1.9  
    1.10  mkdir $PACKAGE
    1.11  dpkg-deb -e $TARBALL $PACKAGE/meta
    1.12 @@ -33,4 +33,3 @@
    1.13  SHORT_DESC="$(sed '/^Description:/!d;s/.*: //' $PACKAGE/meta/control)"
    1.14  #MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
    1.15  VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
    1.16 -mv $PACKAGE $PACKAGE-$VERSION
     2.1 --- a/apk-studio	Tue Aug 02 09:28:45 2016 +0200
     2.2 +++ b/apk-studio	Wed Aug 10 14:15:08 2016 +0200
     2.3 @@ -9,7 +9,7 @@
     2.4  BUILD_DEPENDS="wget"
     2.5  
     2.6  wget --no-check-certificate -O $TARBALL "$WGET_URL"
     2.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
     2.8 +[ -f $TARBALL ] || abort_package
     2.9  
    2.10  mkdir -p $PACKAGE-$VERSION/fs/usr/share/$PACKAGE $PACKAGE-$VERSION/fs/usr/bin
    2.11  tar xjf $TARBALL -C $PACKAGE-$VERSION/fs/usr/share/$PACKAGE
     3.1 --- a/b43-firmware	Tue Aug 02 09:28:45 2016 +0200
     3.2 +++ b/b43-firmware	Wed Aug 10 14:15:08 2016 +0200
     3.3 @@ -5,7 +5,6 @@
     3.4  
     3.5  MODULE=${PACKAGE%-firmware}
     3.6  CATEGORY="non-free"
     3.7 -DEPENDS=""
     3.8  
     3.9  MODULE_LIST=""
    3.10  while read module desc ; do
    3.11 @@ -124,7 +123,7 @@
    3.12  # Get files
    3.13  TARBALL="${TARBALL:-$(basename $WGET_URL)}"
    3.14  wget -O "$TARBALL" "$WGET_URL"
    3.15 -[ -s $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
    3.16 +[ -s $TARBALL ] || abort_package
    3.17  
    3.18  case "$TARBALL" in
    3.19  *rpm)	rpm2cpio < $TARBALL | cpio -id;;
    3.20 @@ -195,6 +194,3 @@
    3.21  	fi
    3.22  }
    3.23  EOT
    3.24 -
    3.25 -[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
    3.26 -cd $tmp_dir
     4.1 --- a/bitcoin	Tue Aug 02 09:28:45 2016 +0200
     4.2 +++ b/bitcoin	Wed Aug 10 14:15:08 2016 +0200
     4.3 @@ -23,7 +23,7 @@
     4.4  [ "$1" == "--get-version" ] && echo $VERSION && exit
     4.5  wget --no-check-certificate -O $TARBALL "$WGET_URL"
     4.6  
     4.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
     4.8 +[ -f $TARBALL ] || abort_package
     4.9  
    4.10  mkdir -p $PACKAGE-$VERSION/fs/usr/bin
    4.11  busybox tar xf $TARBALL
     5.1 --- a/btsync	Tue Aug 02 09:28:45 2016 +0200
     5.2 +++ b/btsync	Wed Aug 10 14:15:08 2016 +0200
     5.3 @@ -10,12 +10,11 @@
     5.4  wget -O $TARBALL $WGET_URL
     5.5  [ -s $TARBALL ] || abort_package
     5.6  
     5.7 -VERSION="$(date +%F | sed 's/-//g')"
     5.8  tar xvzf $TARBALL
     5.9 -cp btsync $PACKAGE-$VERSION/fs/usr/bin
    5.10 -cat README LICENCE.TXT > $PACKAGE-$VERSION/description.txt
    5.11 -mkdir -p $PACKAGE-$VERSION/fs/usr/bin $PACKAGE-$VERSION/fs/usr/share/applications
    5.12 -cat > $PACKAGE-$VERSION/fs/usr/share/applications/btsync.desktop <<EOT
    5.13 +cp btsync $PACKAGE/fs/usr/bin
    5.14 +cat README LICENCE.TXT > $PACKAGE/description.txt
    5.15 +mkdir -p $PACKAGE-$VERSION/fs/usr/bin $PACKAGE/fs/usr/share/applications
    5.16 +cat > $PACKAGE/fs/usr/share/applications/btsync.desktop <<EOT
    5.17  [Desktop Entry]
    5.18  Version=1.0
    5.19  Encoding=UTF-8
     6.1 --- a/cpp2	Tue Aug 02 09:28:45 2016 +0200
     6.2 +++ b/cpp2	Wed Aug 10 14:15:08 2016 +0200
     6.3 @@ -9,7 +9,7 @@
     6.4  WGET_URL=http://old-releases.ubuntu.com/ubuntu/pool/universe/g/gcc-2.95/$TARBALL
     6.5  
     6.6  wget $WGET_URL
     6.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
     6.8 +[ -f $TARBALL ] || abort_package
     6.9  
    6.10  mkdir $PACKAGE
    6.11  dpkg-deb -e $TARBALL $PACKAGE/meta
     7.1 --- a/dropbox	Tue Aug 02 09:28:45 2016 +0200
     7.2 +++ b/dropbox	Wed Aug 10 14:15:08 2016 +0200
     7.3 @@ -10,24 +10,21 @@
     7.4  # Download the file
     7.5  wget --no-check-certificate -O $TARBALL $WGET_URL 
     7.6  
     7.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
     7.8 +[ -f $TARBALL ] || abort_package
     7.9  
    7.10  tar xzf $TARBALL
    7.11  # extracted pkg can be removed: Save RAM
    7.12  rm -f $TARBALL
    7.13 -VERSION="$(cat $tmp_dir/.dropbox-dist/VERSION)"
    7.14 +VERSION="$(cat .dropbox-dist/VERSION)"
    7.15  
    7.16 -mkdir -p $PACKAGE-$VERSION/fs/usr/lib \
    7.17 -	$PACKAGE-$VERSION/fs/usr/bin \
    7.18 -	$PACKAGE-$VERSION/fs/usr/share/applications \
    7.19 -	$PACKAGE-$VERSION/fs/usr/share/pixmaps 
    7.20 +USR=$PACKAGE-$VERSION/fs/usr
    7.21 +mkdir -p $USR/lib $USR/bin $USR/share/applications $USR/share/pixmaps 
    7.22  
    7.23 -mv $tmp_dir/.dropbox-dist $PACKAGE-$VERSION/fs/usr/lib/dropbox
    7.24 -mv -f $PACKAGE-$VERSION/fs/usr/lib/dropbox/dropbox-$PLATFORM*/* \
    7.25 -	$PACKAGE-$VERSION/fs/usr/lib/dropbox
    7.26 +mv .dropbox-dist $USR/lib/dropbox
    7.27 +mv -f $USR/lib/dropbox/dropbox-$PLATFORM*/* $USR/lib/dropbox
    7.28  
    7.29  # Desktop file
    7.30 -cat > $PACKAGE-$VERSION/fs/usr/share/applications/dropbox.desktop << EOT
    7.31 +cat > $USR/share/applications/dropbox.desktop << EOT
    7.32  [Desktop Entry]
    7.33  Type=Application
    7.34  Name=Dropbox Storage
    7.35 @@ -38,11 +35,7 @@
    7.36  EOT
    7.37  
    7.38  # Symlink to have Dropbox in PATH and fake nautilus
    7.39 -cd $PACKAGE-$VERSION/fs/usr/bin
    7.40 -rm -f dropboxd nautilus
    7.41 -ln -s ../lib/dropbox/dropboxd .
    7.42 -ln -s /usr/bin/pcmanfm nautilus
    7.43 -cd ..
    7.44 -ln $(find lib | sed '/logo\.png$/!d;q') share/pixmaps/dropbox.png
    7.45 -
    7.46 -cd $tmp_dir
    7.47 +rm -f $USR/bin/dropboxd $USR/bin/nautilus
    7.48 +ln -s ../lib/dropbox/dropboxd $USR/bin
    7.49 +ln -s /usr/bin/pcmanfm $USR/bin/nautilus
    7.50 +ln $(find $USR/lib | sed '/logo\.png$/!d;q') $USR/share/pixmaps/dropbox.png
     8.1 --- a/exploit_suggester	Tue Aug 02 09:28:45 2016 +0200
     8.2 +++ b/exploit_suggester	Wed Aug 10 14:15:08 2016 +0200
     8.3 @@ -6,8 +6,7 @@
     8.4  WGET_URL="https://github.com/PenturaLabs/Linux_Exploit_Suggester/tarball/master"
     8.5  DEPENDS="perl"
     8.6  BUILD_DEPENDS="wget"
     8.7 -VERSION="$(date +%Y%m%d)"
     8.8  
     8.9  wget -c --no-check-certificate -O - $WGET_URL | tar xzf -
    8.10 -mkdir -p $PACKAGE-$VERSION/fs/usr/bin
    8.11 -mv *Linux_Exploit_Sug*/Linux_Exploit_Suggester.pl $PACKAGE-$VERSION/fs/usr/bin
    8.12 +mkdir -p $PACKAGE/fs/usr/bin
    8.13 +mv *Linux_Exploit_Sug*/Linux_Exploit_Suggester.pl $PACKAGE/fs/usr/bin
     9.1 --- a/firefox-official	Tue Aug 02 09:28:45 2016 +0200
     9.2 +++ b/firefox-official	Wed Aug 10 14:15:08 2016 +0200
     9.3 @@ -15,23 +15,18 @@
     9.4  DEPENDS="gtk+"
     9.5  
     9.6  wget $WGET_URL
     9.7 -[ -f $TARBALL ] ||
     9.8 -abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
     9.9 +[ -f $TARBALL ] || abort_package
    9.10  
    9.11 -DESTDIR=$PWD/$PACKAGE-$VERSION/fs
    9.12 +USR=$PWD/$PACKAGE-$VERSION/fs/usr
    9.13  
    9.14 -mkdir -p \
    9.15 -	$DESTDIR/usr/bin \
    9.16 -	$DESTDIR/usr/lib/firefox-$VERSION \
    9.17 -	$DESTDIR/usr/share/applications \
    9.18 -	$DESTDIR/usr/share/pixmaps
    9.19 -tar xjf $TARBALL -C $DESTDIR/usr/lib/firefox-$VERSION
    9.20 +mkdir -p $USR/bin $USR/lib/firefox-$VERSION $USR/share/applications $USR/share/pixmaps
    9.21 +tar xjf $TARBALL -C $USR/lib/firefox-$VERSION
    9.22  # /usr/bin/firefox-official + pixmap
    9.23 -cd $DESTDIR/usr/bin
    9.24 +cd $USR/bin
    9.25  ln -s $(find ../lib/firefox-$VERSION | sed '/firefox-bin$/!dq') $PACKAGE
    9.26 -cd $DESTDIR/usr/share/pixmaps
    9.27 +cd $USR/share/pixmaps
    9.28  ln -s $(find ../../lib/firefox-$VERSION | sed '/zicon128.png$/!dq') $PACKAGE.png
    9.29 -cat > $DESTDIR/usr/share/applications/$PACKAGE.desktop <<EOT
    9.30 +cat > $USR/share/applications/$PACKAGE.desktop <<EOT
    9.31  [Desktop Entry]
    9.32  Type=Application
    9.33  Name=Firefox Web Browser (official)
    9.34 @@ -41,4 +36,4 @@
    9.35  Categories=Network;WebBrowser;
    9.36  EOT
    9.37  # Remove updater files (users can't upgrade anyway)
    9.38 -rm -f $DESTDIR/usr/lib/firefox-$VERSION/update*
    9.39 +rm -f $USR/lib/firefox-$VERSION/update*
    10.1 --- a/flash-plugin	Tue Aug 02 09:28:45 2016 +0200
    10.2 +++ b/flash-plugin	Wed Aug 10 14:15:08 2016 +0200
    10.3 @@ -5,26 +5,23 @@
    10.4  
    10.5  WGET_URL=http://fpdownload.macromedia.com/get/flashplayer/current/licensing/linux/$TARBALL
    10.6  busybox wget -O $TARBALL $WGET_URL
    10.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
    10.8 +[ -f $TARBALL ] || abort_package
    10.9  tar xzf $TARBALL
   10.10  VERSION="$(strings libflashplayer.so | sed '/FlashPlayer_/!d;s/.*yer_\(.*\)_Flash.*/\1/;s/_/./g')"
   10.11  
   10.12  # Install files
   10.13  chmod 755 libflashplayer.so
   10.14  chown root.root libflashplayer.so
   10.15 -dir=$PACKAGE-$VERSION/fs
   10.16 -mkdir -p $dir/usr/share/flash
   10.17 -mv libflashplayer.so $dir/usr/share/flash
   10.18 -mv usr/bin $dir/usr
   10.19 -mv usr/share/icons $dir/usr/share
   10.20 -mv usr/share/pixmaps $dir/usr/share
   10.21 -mv usr/share/applications $dir/usr/share
   10.22 +USR=$PACKAGE-$VERSION/fs/usr
   10.23 +mkdir -p $USR/share/flash $USR/lib
   10.24 +mv libflashplayer.so $USR/share/flash
   10.25 +mv usr/bin $USR
   10.26 +mv usr/share/icons usr/share/pixmaps usr/share/applications $USR/share
   10.27  
   10.28  # Sanity Check: Reexport firefox libraries if they don't exist
   10.29 -dir=$PACKAGE-$VERSION/fs/usr/lib
   10.30 -mkdir -p $dir
   10.31  for i in /usr/lib/firefox/*.so ; do
   10.32 -  	[ -f $i ] && [ -z "`ls /usr/lib/$(basename $i)`" ] && ln -s $i $dir	
   10.33 +	[ -f $i ] && [ -z "$(ls /usr/lib/$(basename $i 2> /dev/null))" ] &&
   10.34 +	ln -s $i $USR/lib
   10.35  done
   10.36  
   10.37  # Create pseudo package
    11.1 --- a/gcc2	Tue Aug 02 09:28:45 2016 +0200
    11.2 +++ b/gcc2	Wed Aug 10 14:15:08 2016 +0200
    11.3 @@ -10,7 +10,7 @@
    11.4  DEPENDS="cpp2 binutils"
    11.5  
    11.6  wget $WGET_URL
    11.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
    11.8 +[ -f $TARBALL ] || abort_package
    11.9  
   11.10  mkdir $PACKAGE
   11.11  dpkg-deb -e $TARBALL $PACKAGE/meta
    12.1 --- a/gcc272	Tue Aug 02 09:28:45 2016 +0200
    12.2 +++ b/gcc272	Wed Aug 10 14:15:08 2016 +0200
    12.3 @@ -10,7 +10,7 @@
    12.4  DEPENDS="binutils"
    12.5  
    12.6  wget $WGET_URL
    12.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
    12.8 +[ -f $TARBALL ] || abort_package
    12.9  
   12.10  mkdir $PACKAGE
   12.11  dpkg-deb -e $TARBALL $PACKAGE/meta
    13.1 --- a/geogebra	Tue Aug 02 09:28:45 2016 +0200
    13.2 +++ b/geogebra	Wed Aug 10 14:15:08 2016 +0200
    13.3 @@ -11,7 +11,7 @@
    13.4  
    13.5  wget -O $TARBALL $WGET_URL
    13.6  
    13.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
    13.8 +[ -f $TARBALL ] || abort_package
    13.9  
   13.10  mkdir $PACKAGE
   13.11  dpkg-deb -e $TARBALL $PACKAGE/meta
   13.12 @@ -25,4 +25,3 @@
   13.13  MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
   13.14  VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
   13.15  TARBALL=${PACKAGE}_$VERSION.deb
   13.16 -mv $PACKAGE $PACKAGE-$VERSION
    14.1 --- a/jad	Tue Aug 02 09:28:45 2016 +0200
    14.2 +++ b/jad	Wed Aug 10 14:15:08 2016 +0200
    14.3 @@ -10,7 +10,7 @@
    14.4  BUILD_DEPENDS="wget"
    14.5  
    14.6  wget -c --no-check-certificate -O $TARBALL $WGET_URL
    14.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
    14.8 +[ -f $TARBALL ] || abort_package
    14.9  
   14.10  chmod +x $TARBALL
   14.11  mkdir -p $PACKAGE-$VERSION/fs/usr/bin
    15.1 --- a/javajre	Tue Aug 02 09:28:45 2016 +0200
    15.2 +++ b/javajre	Wed Aug 10 14:15:08 2016 +0200
    15.3 @@ -3,7 +3,7 @@
    15.4  # end of get.list data
    15.5  WGET_URL="$(wget -O - "$WEB_SITE" | sed '/Linux rpm/!d;s/.*href="\([^"]*\).*/\1/;q')"
    15.6  wget -O - "$WGET_URL" > p.rpm
    15.7 -[ -s p.rpm ] || abort_package "Could not download RPM from $WGET_URL. Exiting."
    15.8 +[ -s p.rpm ] || abort_package
    15.9  
   15.10  VERSION="$(rpm -qip p.rpm | awk '/Version/ { print $3 }')"
   15.11  LICENSE="$(rpm -qip p.rpm | awk '/License/ { print $5 }')"
    16.1 --- a/jd-gui	Tue Aug 02 09:28:45 2016 +0200
    16.2 +++ b/jd-gui	Wed Aug 10 14:15:08 2016 +0200
    16.3 @@ -5,7 +5,7 @@
    16.4  TARBALL="$(basename $WGET_URL)"
    16.5  
    16.6  wget -O $TARBALL $WGET_URL
    16.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
    16.8 +[ -f $TARBALL ] || abort_package
    16.9  
   16.10  tar xzf $TARBALL
   16.11  VERSION="$(echo $TARBALL | sed 's/.*-\(.*\).linux.*/\1/')"
    17.1 --- a/kiwix	Tue Aug 02 09:28:45 2016 +0200
    17.2 +++ b/kiwix	Wed Aug 10 14:15:08 2016 +0200
    17.3 @@ -10,12 +10,11 @@
    17.4  wget -O $TARBALL $WGET_URL
    17.5  [ -s $TARBALL ] || abort_package
    17.6  
    17.7 -VERSION="$(date +%F | sed 's/-//g')"
    17.8 -mkdir -p $PACKAGE-$VERSION/fs/opt $PACKAGE-$VERSION/fs/usr/share/applications
    17.9 +mkdir -p $PACKAGE/fs/opt $PACKAGE/fs/usr/share/applications
   17.10  
   17.11  # Extract package
   17.12 -busybox tar xf $TARBALL -C $PACKAGE-$VERSION/fs/opt
   17.13 -cat > $PACKAGE-$VERSION/fs/usr/share/applications/kiwix.desktop <<EOT
   17.14 +busybox tar xf $TARBALL -C $PACKAGE/fs/opt
   17.15 +cat > $PACKAGE/fs/usr/share/applications/kiwix.desktop <<EOT
   17.16  [Desktop Entry]
   17.17  Type=Application
   17.18  Name=Wikipedia Encyclopedia
    18.1 --- a/libreoffice	Tue Aug 02 09:28:45 2016 +0200
    18.2 +++ b/libreoffice	Wed Aug 10 14:15:08 2016 +0200
    18.3 @@ -3,14 +3,6 @@
    18.4  CATEGORY="office"
    18.5  LICENSE="LGPL3"
    18.6  # end of get.list data
    18.7 -#!/bin/sh
    18.8 -# get-LibreOffice - install LibreOffice excl. KDE/Gnome integration & test suite.
    18.9 -#
   18.10 -# (C) 2010 SliTaz - GNU General Public License v3.
   18.11 -# Author : Ben Arnold <ben@seawolfsanctuary.com>
   18.12 -#    via : get-OpenOffice3 (Eric Joseph-Alexandre <erjo@slitaz.org>)
   18.13 -#
   18.14 -
   18.15  PACKAGE="LibreOffice"
   18.16  DEPENDS="cups"
   18.17  SUGGESTED="java6-jre"
   18.18 @@ -60,7 +52,7 @@
   18.19  fi
   18.20  if [ ! -f $SOURCE_DIR/$TARBALL ]; then
   18.21  	rm -rf $SOURCE_DIR
   18.22 -	abort_package "Could not download $TARBALL. Exiting."
   18.23 +	abort_package
   18.24  fi
   18.25  
   18.26  echo -n "Extracting files (this may take a while): "
   18.27 @@ -105,16 +97,16 @@
   18.28  echo -n "Preparing package... "
   18.29  
   18.30  # Make the package
   18.31 -mkdir -p $PACKAGE-$VERSION/fs/usr/lib $PACKAGE-$VERSION/fs/usr/share
   18.32 +USR=$PACKAGE-$VERSION/fs/usr
   18.33 +mkdir -p $USR/lib $USR/share
   18.34  
   18.35  # use mv instead of 'cp -a' to save RAM
   18.36 -mv opt/libreoffice* $PACKAGE-$VERSION/fs/usr/lib/libreoffice
   18.37 -mv usr/share/mime $PACKAGE-$VERSION/fs/usr/share
   18.38 -mv usr/share/icons $PACKAGE-$VERSION/fs/usr/share
   18.39 -mv usr/bin $PACKAGE-$VERSION/fs/usr
   18.40 +mv opt/libreoffice* $USR/lib/libreoffice
   18.41 +mv usr/share/mime usr/share/icons $USR/share
   18.42 +mv usr/bin $USR
   18.43  
   18.44  # relocalized libexec directory
   18.45 -bin=$(echo $PACKAGE-$VERSION/fs/usr/bin/libreoffice${VERSION%.*})
   18.46 +bin=$(echo $USR/bin/libreoffice${VERSION%.*})
   18.47  if [ -L $bin ]; then
   18.48  	target=$(readlink $bin)
   18.49  	rm -f $bin
   18.50 @@ -160,5 +152,3 @@
   18.51  
   18.52  EOT
   18.53  status
   18.54 -[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
   18.55 -cd $tmp_dir
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/nanozip	Wed Aug 10 14:15:08 2016 +0200
    19.3 @@ -0,0 +1,12 @@
    19.4 +SHORT_DESC="An experimental file archiver software."
    19.5 +WEB_SITE="http://nanozip.net/"
    19.6 +# end of get.list data
    19.7 +WGET_URL="$WEB_SITE$(wget -O - $WEB_SITE | \
    19.8 +	  sed '/linux32/!d;s/.*href="*\([^>"]*\).*/\1/;q')"
    19.9 +TARBALL="$(basename $WGET_URL)"
   19.10 +VERSION="$(echo $TARBALL | sed 's/.*-\(.*\).linux32.*/\1/')"
   19.11 +
   19.12 +wget $WGET_URL
   19.13 +unzip $TARBALL
   19.14 +mkdir -p $PACKAGE-$VERSION/fs/usr/bin
   19.15 +mv nz $PACKAGE-$VERSION/fs/usr/bin
    20.1 --- a/openoffice3	Tue Aug 02 09:28:45 2016 +0200
    20.2 +++ b/openoffice3	Wed Aug 10 14:15:08 2016 +0200
    20.3 @@ -3,13 +3,6 @@
    20.4  CATEGORY="office"
    20.5  LICENSE="Apache"
    20.6  # end of get.list data
    20.7 -#!/bin/sh
    20.8 -# get-OpenOffice3, install everything for OpenOffice.org exept KDE/Gnome integration and testsuite.
    20.9 -#
   20.10 -# (C) 2008 SliTaz - GNU General Public License v3.
   20.11 -#
   20.12 -# Author : Eric Joseph-Alexandre <erjo@slitaz.org>
   20.13 -
   20.14  PACKAGE="OpenOffice3"
   20.15  PATTERN="Linux_x86_install-rpm"
   20.16  
   20.17 @@ -38,9 +31,7 @@
   20.18  	break
   20.19  done
   20.20  
   20.21 -if [ -z "$VERSION" ]; then
   20.22 -	abort_package "Can't find VERSION. Abort."
   20.23 -fi
   20.24 +[ "$VERSION" ] || abort_package "Can't find VERSION. Abort."
   20.25  echo "Selecting $DIR version $VERSION ..."
   20.26  TARBALL="$(wget -O - $MIRROR/$DIR/$VERSION/ \
   20.27  	2> /dev/null | grep $PATTERN | tail -1 | sed 's/.*href=\"\(.*\)\".*/\1/')"
   20.28 @@ -64,7 +55,7 @@
   20.29  fi
   20.30  if [ ! -f $SOURCE_DIR/$TARBALL ]; then
   20.31  	rm -rf $SOURCE_DIR
   20.32 -	abort_package "Could not download $TARBALL. Exiting."
   20.33 +	abort_package
   20.34  fi
   20.35  
   20.36  # Creates TEMP_DIR and extract tarball
   20.37 @@ -93,17 +84,16 @@
   20.38  
   20.39  
   20.40  # Make the package
   20.41 -mkdir -p $PACKAGE-$VERSION/fs/usr/lib/openoffice  \
   20.42 -  $PACKAGE-$VERSION/fs/usr/share
   20.43 +USR=$PACKAGE-$VERSION/fs/usr
   20.44 +mkdir -p $USR/lib/openoffice $USR/share
   20.45  
   20.46  # use mv instead of 'cp -a' to save RAM
   20.47 -mv opt/openoffice* $PACKAGE-$VERSION/fs/usr/lib/openoffice
   20.48 -mv usr/share/mime $PACKAGE-$VERSION/fs/usr/share
   20.49 -mv usr/share/icons $PACKAGE-$VERSION/fs/usr/share
   20.50 -mv usr/bin $PACKAGE-$VERSION/fs/usr
   20.51 +mv opt/openoffice* $USR/lib/openoffice
   20.52 +mv usr/share/mime usr/share/icons $USR/share
   20.53 +mv usr/bin $USR
   20.54  
   20.55  # relocalized OOo libexec directory
   20.56 -sed -i 's#/opt/#/usr/lib/openoffice/#'  $PACKAGE-$VERSION/fs/usr/bin/openoffice*
   20.57 +sed -i 's#/opt/#/usr/lib/openoffice/#'  $USR/bin/openoffice*
   20.58  
   20.59  # Create receipt
   20.60  cat > $PACKAGE-$VERSION/receipt <<EOT
   20.61 @@ -168,5 +158,3 @@
   20.62  		mv $1/fs/$file $(dirname $ROOT/$file)
   20.63  	done
   20.64  }
   20.65 -[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
   20.66 -cd $tmp_dir
    21.1 --- a/opera	Tue Aug 02 09:28:45 2016 +0200
    21.2 +++ b/opera	Wed Aug 10 14:15:08 2016 +0200
    21.3 @@ -17,7 +17,7 @@
    21.4  	[ -s $TARBALL ] && break
    21.5  done
    21.6  
    21.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
    21.8 +[ -f $TARBALL ] || abort_package
    21.9  
   21.10  mkdir $PACKAGE
   21.11  dpkg-deb -e $TARBALL $PACKAGE/meta
   21.12 @@ -31,14 +31,14 @@
   21.13  MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
   21.14  VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
   21.15  mv $PACKAGE $PACKAGE-$VERSION
   21.16 -cd $PACKAGE-$VERSION/fs
   21.17 +USR=$PACKAGE-$VERSION/fs/usr
   21.18  
   21.19  # Localized keyboard layout fix
   21.20 -busybox sed "s|sh$|sh\nexport XMODIFIERS=\"@im=none\"|" -i usr/bin/opera
   21.21 +busybox sed "s|sh$|sh\nexport XMODIFIERS=\"@im=none\"|" -i $USR/bin/opera
   21.22  
   21.23  # Create menu
   21.24 -mkdir -p usr/share/applications
   21.25 -cat > usr/share/applications/opera-browser.desktop <<EOT
   21.26 +mkdir -p $USR/share/applications
   21.27 +cat > $USR/share/applications/opera-browser.desktop <<EOT
   21.28  [Desktop Entry]
   21.29  Type=Application
   21.30  Name=Opera
   21.31 @@ -72,16 +72,13 @@
   21.32  Icon=opera-browser
   21.33  MimeType=text/html;text/xml;application/xhtml+xml;application/x-mimearchive;application/xml;application/rss+xml;application/rdf+xml;image/svg+xml;image/gif;image/jpeg;image/png;image/x-bmp;image/x-xbm;application/mime;
   21.34  EOT
   21.35 -cd ../..
   21.36  
   21.37  # Remove unwanted locale
   21.38 -mv $PACKAGE-$VERSION/fs/usr/share/opera/locale $PACKAGE-$VERSION/fs/usr/share/opera/locale-full
   21.39 -mkdir -p $PACKAGE-$VERSION/fs/usr/share/opera/locale 
   21.40 +mv $USR/share/opera/locale $USR/share/opera/locale-full
   21.41 +mkdir -p $USR/share/opera/locale 
   21.42  . /etc/locale.conf
   21.43  for i in $LANG ${LANG/_/-} ${LANG:0:2} en fr ru pt de zh-cn ; do
   21.44 -	[ -d $PACKAGE-$VERSION/fs/usr/share/opera/locale-full/$i ] &&
   21.45 -	cp -a $PACKAGE-$VERSION/fs/usr/share/opera/locale-full/$i \
   21.46 -		$PACKAGE-$VERSION/fs/usr/share/opera/locale
   21.47 +	[ -d $USR/share/opera/locale-full/$i ] &&
   21.48 +	mv $USR/share/opera/locale-full/$i $USR/share/opera/locale
   21.49  done
   21.50 -rm -rf $PACKAGE-$VERSION/fs/usr/share/opera/locale-full
   21.51 -rm -rf $PACKAGE-$VERSION/fs/usr/share/pixmaps
   21.52 +rm -rf $USR/share/opera/locale-full $USR/share/pixmaps
    22.1 --- a/palemoon	Tue Aug 02 09:28:45 2016 +0200
    22.2 +++ b/palemoon	Wed Aug 10 14:15:08 2016 +0200
    22.3 @@ -15,8 +15,7 @@
    22.4  
    22.5  mkdir -p $PACKAGE-$VERSION/fs/opt
    22.6  busybox wget -O - $WGET_URL | tar -xjf - -C $PACKAGE-$VERSION/fs/opt
    22.7 -[ -d $PACKAGE-$VERSION/fs/opt/palemoon ] ||
    22.8 -abort_package "Could not download $TARBALL from $URL. Exiting."
    22.9 +[ -d $PACKAGE-$VERSION/fs/opt/palemoon ] || abort_package
   22.10  
   22.11  DESKTOP=$PACKAGE-$VERSION/fs/usr/share/applications/palemoon.desktop
   22.12  mkdir -p $(dirname $DESKTOP)
    23.1 --- a/speedtouch-firmware	Tue Aug 02 09:28:45 2016 +0200
    23.2 +++ b/speedtouch-firmware	Wed Aug 10 14:15:08 2016 +0200
    23.3 @@ -1,7 +1,6 @@
    23.4  SHORT_DESC="Firmware for SpeedTouch ADSL Modem."
    23.5  WEB_SITE="http://www.linux-usb.org/SpeedTouch/"
    23.6  # end of get.list data
    23.7 -DEPENDS=""
    23.8  
    23.9  VERSION="3.012"
   23.10  mkdir -p $PACKAGE-$VERSION/fs/lib/firmware
   23.11 @@ -11,7 +10,7 @@
   23.12  #from http://www.filewatcher.com/m/SpeedTouch330_firmware_3012.zip.769125-0.html
   23.13  WGET_URL="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$TARBALL"
   23.14  wget $WGET_URL
   23.15 -[ $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
   23.16 +[ $TARBALL ] || abort_package
   23.17  unzip -n $(basename $WGET_URL)
   23.18  wget http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
   23.19  tar xzf firmware-extractor.tar.gz
    24.1 --- a/sublime-text-3	Tue Aug 02 09:28:45 2016 +0200
    24.2 +++ b/sublime-text-3	Wed Aug 10 14:15:08 2016 +0200
    24.3 @@ -8,7 +8,7 @@
    24.4  TARBALL="$(basename $WGET_URL)"
    24.5  
    24.6  busybox wget $WGET_URL
    24.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
    24.8 +[ -f $TARBALL ] || abort_package
    24.9  
   24.10  mkdir -p $PACKAGE-$VERSION/fs/opt $PACKAGE-$VERSION/fs/usr/share/applications
   24.11  cd $PACKAGE-$VERSION/fs/opt
    25.1 --- a/teamviewer	Tue Aug 02 09:28:45 2016 +0200
    25.2 +++ b/teamviewer	Wed Aug 10 14:15:08 2016 +0200
    25.3 @@ -9,7 +9,7 @@
    25.4  TARBALL="$(basename $WGET_URL)"
    25.5  wget --no-check-certificate -O $TARBALL $WGET_URL
    25.6  
    25.7 -[ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
    25.8 +[ -f $TARBALL ] || abort_package
    25.9  
   25.10  mkdir $PACKAGE
   25.11  dpkg-deb -e $TARBALL $PACKAGE/meta
   25.12 @@ -38,8 +38,5 @@
   25.13  	$(find opt -type f | grep /$PACKAGE$)
   25.14  mkdir -p etc/init.d
   25.15  ln -s /$(find opt | grep /teamviewerd$) etc/init.d/teamviewerd
   25.16 -cd ../..
   25.17  
   25.18  # Web viewer (needs flash): https://go.teamviewer.com/v${VERSION%%.*}/
   25.19 -
   25.20 -cd $tmp_dir
    26.1 --- a/ueagle-firmware	Tue Aug 02 09:28:45 2016 +0200
    26.2 +++ b/ueagle-firmware	Wed Aug 10 14:15:08 2016 +0200
    26.3 @@ -1,7 +1,7 @@
    26.4  SHORT_DESC="Firmware for Fast800 USB ADSL Modem."
    26.5  WEB_SITE="http://eagle-usb.org/"
    26.6 +VERSION="1.1"
    26.7  # end of get.list data
    26.8 -DEPENDS=""
    26.9  
   26.10  wget_ueagle()
   26.11  {
   26.12 @@ -15,8 +15,6 @@
   26.13  	abort_package "Could not download $1. Exiting."
   26.14  }
   26.15  
   26.16 -mkdir -p $PACKAGE-$VERSION/fs/lib/firmware
   26.17 -VERSION="1.1"
   26.18  TARBALL="ueagle-data-$VERSION.tar.gz"
   26.19  SOURCE="ueagle-data"
   26.20  wget_ueagle ueagle4-data-1.0.tar.gz <<EOT
   26.21 @@ -30,9 +28,8 @@
   26.22  ftp://ftp.coolmax.one.pl/pub/linux/repository/pkg/linux-atm/Internet
   26.23  http://eagle-usb.org/ueagle-atm/non-free
   26.24  EOT
   26.25 -mkdir -p $PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm
   26.26 -cp -a ueagle-*/*.fw ueagle-*/*.bin ueagle4*/*.fw ueagle4*/*.bin* \
   26.27 -	$PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm
   26.28 -chown root.root $PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm/*
   26.29 -ln $PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin.v2 \
   26.30 -	$PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin || true
   26.31 +FIRMWARE=$PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm
   26.32 +mkdir -p $FIRMWARE
   26.33 +cp -a ueagle-*/*.fw ueagle-*/*.bin ueagle4*/*.fw ueagle4*/*.bin* $FIRMWARE
   26.34 +chown root.root $FIRMWARE/*
   26.35 +ln $FIRMWARE/CMV4p.bin.v2 $FIRMWARE/CMV4p.bin || true
    27.1 --- a/vivaldi	Tue Aug 02 09:28:45 2016 +0200
    27.2 +++ b/vivaldi	Wed Aug 10 14:15:08 2016 +0200
    27.3 @@ -16,8 +16,9 @@
    27.4  
    27.5  # Add icons
    27.6  for size in 16 22 24 32 48 64 128 256; do
    27.7 -	mkdir -p "usr/share/icons/hicolor/${size}x$size/apps"
    27.8 -	ln -s /opt/vivaldi/product_logo_$size.png "usr/share/icons/hicolor/${size}x$size/apps/vivaldi.png"
    27.9 +	dest="usr/share/icons/hicolor/${size}x$size/apps"
   27.10 +	mkdir -p $dest
   27.11 +	ln -s /opt/vivaldi/product_logo_$size.png "$dest/vivaldi.png"
   27.12  done
   27.13  mkdir -p $PACKAGE-$VERSION/fs
   27.14  mv opt usr $PACKAGE-$VERSION/fs