# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1470831308 -7200
# Node ID 62d94e6800dbb364587e768f1daea385be8fedbd
# Parent  35a7d83513d20e6ceb1648ba754494f007ff4491
Add nanozip

diff -r 35a7d83513d2 -r 62d94e6800db FoxitReader
--- a/FoxitReader	Tue Aug 02 09:28:45 2016 +0200
+++ b/FoxitReader	Wed Aug 10 14:15:08 2016 +0200
@@ -20,7 +20,7 @@
 done
 
 wget $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
@@ -33,4 +33,3 @@
 SHORT_DESC="$(sed '/^Description:/!d;s/.*: //' $PACKAGE/meta/control)"
 #MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
 VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
-mv $PACKAGE $PACKAGE-$VERSION
diff -r 35a7d83513d2 -r 62d94e6800db apk-studio
--- a/apk-studio	Tue Aug 02 09:28:45 2016 +0200
+++ b/apk-studio	Wed Aug 10 14:15:08 2016 +0200
@@ -9,7 +9,7 @@
 BUILD_DEPENDS="wget"
 
 wget --no-check-certificate -O $TARBALL "$WGET_URL"
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir -p $PACKAGE-$VERSION/fs/usr/share/$PACKAGE $PACKAGE-$VERSION/fs/usr/bin
 tar xjf $TARBALL -C $PACKAGE-$VERSION/fs/usr/share/$PACKAGE
diff -r 35a7d83513d2 -r 62d94e6800db b43-firmware
--- a/b43-firmware	Tue Aug 02 09:28:45 2016 +0200
+++ b/b43-firmware	Wed Aug 10 14:15:08 2016 +0200
@@ -5,7 +5,6 @@
 
 MODULE=${PACKAGE%-firmware}
 CATEGORY="non-free"
-DEPENDS=""
 
 MODULE_LIST=""
 while read module desc ; do
@@ -124,7 +123,7 @@
 # Get files
 TARBALL="${TARBALL:-$(basename $WGET_URL)}"
 wget -O "$TARBALL" "$WGET_URL"
-[ -s $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
+[ -s $TARBALL ] || abort_package
 
 case "$TARBALL" in
 *rpm)	rpm2cpio < $TARBALL | cpio -id;;
@@ -195,6 +194,3 @@
 	fi
 }
 EOT
-
-[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
-cd $tmp_dir
diff -r 35a7d83513d2 -r 62d94e6800db bitcoin
--- a/bitcoin	Tue Aug 02 09:28:45 2016 +0200
+++ b/bitcoin	Wed Aug 10 14:15:08 2016 +0200
@@ -23,7 +23,7 @@
 [ "$1" == "--get-version" ] && echo $VERSION && exit
 wget --no-check-certificate -O $TARBALL "$WGET_URL"
 
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir -p $PACKAGE-$VERSION/fs/usr/bin
 busybox tar xf $TARBALL
diff -r 35a7d83513d2 -r 62d94e6800db btsync
--- a/btsync	Tue Aug 02 09:28:45 2016 +0200
+++ b/btsync	Wed Aug 10 14:15:08 2016 +0200
@@ -10,12 +10,11 @@
 wget -O $TARBALL $WGET_URL
 [ -s $TARBALL ] || abort_package
 
-VERSION="$(date +%F | sed 's/-//g')"
 tar xvzf $TARBALL
-cp btsync $PACKAGE-$VERSION/fs/usr/bin
-cat README LICENCE.TXT > $PACKAGE-$VERSION/description.txt
-mkdir -p $PACKAGE-$VERSION/fs/usr/bin $PACKAGE-$VERSION/fs/usr/share/applications
-cat > $PACKAGE-$VERSION/fs/usr/share/applications/btsync.desktop <<EOT
+cp btsync $PACKAGE/fs/usr/bin
+cat README LICENCE.TXT > $PACKAGE/description.txt
+mkdir -p $PACKAGE-$VERSION/fs/usr/bin $PACKAGE/fs/usr/share/applications
+cat > $PACKAGE/fs/usr/share/applications/btsync.desktop <<EOT
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
diff -r 35a7d83513d2 -r 62d94e6800db cpp2
--- a/cpp2	Tue Aug 02 09:28:45 2016 +0200
+++ b/cpp2	Wed Aug 10 14:15:08 2016 +0200
@@ -9,7 +9,7 @@
 WGET_URL=http://old-releases.ubuntu.com/ubuntu/pool/universe/g/gcc-2.95/$TARBALL
 
 wget $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
diff -r 35a7d83513d2 -r 62d94e6800db dropbox
--- a/dropbox	Tue Aug 02 09:28:45 2016 +0200
+++ b/dropbox	Wed Aug 10 14:15:08 2016 +0200
@@ -10,24 +10,21 @@
 # Download the file
 wget --no-check-certificate -O $TARBALL $WGET_URL 
 
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 tar xzf $TARBALL
 # extracted pkg can be removed: Save RAM
 rm -f $TARBALL
-VERSION="$(cat $tmp_dir/.dropbox-dist/VERSION)"
+VERSION="$(cat .dropbox-dist/VERSION)"
 
-mkdir -p $PACKAGE-$VERSION/fs/usr/lib \
-	$PACKAGE-$VERSION/fs/usr/bin \
-	$PACKAGE-$VERSION/fs/usr/share/applications \
-	$PACKAGE-$VERSION/fs/usr/share/pixmaps 
+USR=$PACKAGE-$VERSION/fs/usr
+mkdir -p $USR/lib $USR/bin $USR/share/applications $USR/share/pixmaps 
 
-mv $tmp_dir/.dropbox-dist $PACKAGE-$VERSION/fs/usr/lib/dropbox
-mv -f $PACKAGE-$VERSION/fs/usr/lib/dropbox/dropbox-$PLATFORM*/* \
-	$PACKAGE-$VERSION/fs/usr/lib/dropbox
+mv .dropbox-dist $USR/lib/dropbox
+mv -f $USR/lib/dropbox/dropbox-$PLATFORM*/* $USR/lib/dropbox
 
 # Desktop file
-cat > $PACKAGE-$VERSION/fs/usr/share/applications/dropbox.desktop << EOT
+cat > $USR/share/applications/dropbox.desktop << EOT
 [Desktop Entry]
 Type=Application
 Name=Dropbox Storage
@@ -38,11 +35,7 @@
 EOT
 
 # Symlink to have Dropbox in PATH and fake nautilus
-cd $PACKAGE-$VERSION/fs/usr/bin
-rm -f dropboxd nautilus
-ln -s ../lib/dropbox/dropboxd .
-ln -s /usr/bin/pcmanfm nautilus
-cd ..
-ln $(find lib | sed '/logo\.png$/!d;q') share/pixmaps/dropbox.png
-
-cd $tmp_dir
+rm -f $USR/bin/dropboxd $USR/bin/nautilus
+ln -s ../lib/dropbox/dropboxd $USR/bin
+ln -s /usr/bin/pcmanfm $USR/bin/nautilus
+ln $(find $USR/lib | sed '/logo\.png$/!d;q') $USR/share/pixmaps/dropbox.png
diff -r 35a7d83513d2 -r 62d94e6800db exploit_suggester
--- a/exploit_suggester	Tue Aug 02 09:28:45 2016 +0200
+++ b/exploit_suggester	Wed Aug 10 14:15:08 2016 +0200
@@ -6,8 +6,7 @@
 WGET_URL="https://github.com/PenturaLabs/Linux_Exploit_Suggester/tarball/master"
 DEPENDS="perl"
 BUILD_DEPENDS="wget"
-VERSION="$(date +%Y%m%d)"
 
 wget -c --no-check-certificate -O - $WGET_URL | tar xzf -
-mkdir -p $PACKAGE-$VERSION/fs/usr/bin
-mv *Linux_Exploit_Sug*/Linux_Exploit_Suggester.pl $PACKAGE-$VERSION/fs/usr/bin
+mkdir -p $PACKAGE/fs/usr/bin
+mv *Linux_Exploit_Sug*/Linux_Exploit_Suggester.pl $PACKAGE/fs/usr/bin
diff -r 35a7d83513d2 -r 62d94e6800db firefox-official
--- a/firefox-official	Tue Aug 02 09:28:45 2016 +0200
+++ b/firefox-official	Wed Aug 10 14:15:08 2016 +0200
@@ -15,23 +15,18 @@
 DEPENDS="gtk+"
 
 wget $WGET_URL
-[ -f $TARBALL ] ||
-abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
-DESTDIR=$PWD/$PACKAGE-$VERSION/fs
+USR=$PWD/$PACKAGE-$VERSION/fs/usr
 
-mkdir -p \
-	$DESTDIR/usr/bin \
-	$DESTDIR/usr/lib/firefox-$VERSION \
-	$DESTDIR/usr/share/applications \
-	$DESTDIR/usr/share/pixmaps
-tar xjf $TARBALL -C $DESTDIR/usr/lib/firefox-$VERSION
+mkdir -p $USR/bin $USR/lib/firefox-$VERSION $USR/share/applications $USR/share/pixmaps
+tar xjf $TARBALL -C $USR/lib/firefox-$VERSION
 # /usr/bin/firefox-official + pixmap
-cd $DESTDIR/usr/bin
+cd $USR/bin
 ln -s $(find ../lib/firefox-$VERSION | sed '/firefox-bin$/!dq') $PACKAGE
-cd $DESTDIR/usr/share/pixmaps
+cd $USR/share/pixmaps
 ln -s $(find ../../lib/firefox-$VERSION | sed '/zicon128.png$/!dq') $PACKAGE.png
-cat > $DESTDIR/usr/share/applications/$PACKAGE.desktop <<EOT
+cat > $USR/share/applications/$PACKAGE.desktop <<EOT
 [Desktop Entry]
 Type=Application
 Name=Firefox Web Browser (official)
@@ -41,4 +36,4 @@
 Categories=Network;WebBrowser;
 EOT
 # Remove updater files (users can't upgrade anyway)
-rm -f $DESTDIR/usr/lib/firefox-$VERSION/update*
+rm -f $USR/lib/firefox-$VERSION/update*
diff -r 35a7d83513d2 -r 62d94e6800db flash-plugin
--- a/flash-plugin	Tue Aug 02 09:28:45 2016 +0200
+++ b/flash-plugin	Wed Aug 10 14:15:08 2016 +0200
@@ -5,26 +5,23 @@
 
 WGET_URL=http://fpdownload.macromedia.com/get/flashplayer/current/licensing/linux/$TARBALL
 busybox wget -O $TARBALL $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
+[ -f $TARBALL ] || abort_package
 tar xzf $TARBALL
 VERSION="$(strings libflashplayer.so | sed '/FlashPlayer_/!d;s/.*yer_\(.*\)_Flash.*/\1/;s/_/./g')"
 
 # Install files
 chmod 755 libflashplayer.so
 chown root.root libflashplayer.so
-dir=$PACKAGE-$VERSION/fs
-mkdir -p $dir/usr/share/flash
-mv libflashplayer.so $dir/usr/share/flash
-mv usr/bin $dir/usr
-mv usr/share/icons $dir/usr/share
-mv usr/share/pixmaps $dir/usr/share
-mv usr/share/applications $dir/usr/share
+USR=$PACKAGE-$VERSION/fs/usr
+mkdir -p $USR/share/flash $USR/lib
+mv libflashplayer.so $USR/share/flash
+mv usr/bin $USR
+mv usr/share/icons usr/share/pixmaps usr/share/applications $USR/share
 
 # Sanity Check: Reexport firefox libraries if they don't exist
-dir=$PACKAGE-$VERSION/fs/usr/lib
-mkdir -p $dir
 for i in /usr/lib/firefox/*.so ; do
-  	[ -f $i ] && [ -z "`ls /usr/lib/$(basename $i)`" ] && ln -s $i $dir	
+	[ -f $i ] && [ -z "$(ls /usr/lib/$(basename $i 2> /dev/null))" ] &&
+	ln -s $i $USR/lib
 done
 
 # Create pseudo package
diff -r 35a7d83513d2 -r 62d94e6800db gcc2
--- a/gcc2	Tue Aug 02 09:28:45 2016 +0200
+++ b/gcc2	Wed Aug 10 14:15:08 2016 +0200
@@ -10,7 +10,7 @@
 DEPENDS="cpp2 binutils"
 
 wget $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
diff -r 35a7d83513d2 -r 62d94e6800db gcc272
--- a/gcc272	Tue Aug 02 09:28:45 2016 +0200
+++ b/gcc272	Wed Aug 10 14:15:08 2016 +0200
@@ -10,7 +10,7 @@
 DEPENDS="binutils"
 
 wget $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
diff -r 35a7d83513d2 -r 62d94e6800db geogebra
--- a/geogebra	Tue Aug 02 09:28:45 2016 +0200
+++ b/geogebra	Wed Aug 10 14:15:08 2016 +0200
@@ -11,7 +11,7 @@
 
 wget -O $TARBALL $WGET_URL
 
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
@@ -25,4 +25,3 @@
 MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
 VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
 TARBALL=${PACKAGE}_$VERSION.deb
-mv $PACKAGE $PACKAGE-$VERSION
diff -r 35a7d83513d2 -r 62d94e6800db jad
--- a/jad	Tue Aug 02 09:28:45 2016 +0200
+++ b/jad	Wed Aug 10 14:15:08 2016 +0200
@@ -10,7 +10,7 @@
 BUILD_DEPENDS="wget"
 
 wget -c --no-check-certificate -O $TARBALL $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 chmod +x $TARBALL
 mkdir -p $PACKAGE-$VERSION/fs/usr/bin
diff -r 35a7d83513d2 -r 62d94e6800db javajre
--- a/javajre	Tue Aug 02 09:28:45 2016 +0200
+++ b/javajre	Wed Aug 10 14:15:08 2016 +0200
@@ -3,7 +3,7 @@
 # end of get.list data
 WGET_URL="$(wget -O - "$WEB_SITE" | sed '/Linux rpm/!d;s/.*href="\([^"]*\).*/\1/;q')"
 wget -O - "$WGET_URL" > p.rpm
-[ -s p.rpm ] || abort_package "Could not download RPM from $WGET_URL. Exiting."
+[ -s p.rpm ] || abort_package
 
 VERSION="$(rpm -qip p.rpm | awk '/Version/ { print $3 }')"
 LICENSE="$(rpm -qip p.rpm | awk '/License/ { print $5 }')"
diff -r 35a7d83513d2 -r 62d94e6800db jd-gui
--- a/jd-gui	Tue Aug 02 09:28:45 2016 +0200
+++ b/jd-gui	Wed Aug 10 14:15:08 2016 +0200
@@ -5,7 +5,7 @@
 TARBALL="$(basename $WGET_URL)"
 
 wget -O $TARBALL $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 tar xzf $TARBALL
 VERSION="$(echo $TARBALL | sed 's/.*-\(.*\).linux.*/\1/')"
diff -r 35a7d83513d2 -r 62d94e6800db kiwix
--- a/kiwix	Tue Aug 02 09:28:45 2016 +0200
+++ b/kiwix	Wed Aug 10 14:15:08 2016 +0200
@@ -10,12 +10,11 @@
 wget -O $TARBALL $WGET_URL
 [ -s $TARBALL ] || abort_package
 
-VERSION="$(date +%F | sed 's/-//g')"
-mkdir -p $PACKAGE-$VERSION/fs/opt $PACKAGE-$VERSION/fs/usr/share/applications
+mkdir -p $PACKAGE/fs/opt $PACKAGE/fs/usr/share/applications
 
 # Extract package
-busybox tar xf $TARBALL -C $PACKAGE-$VERSION/fs/opt
-cat > $PACKAGE-$VERSION/fs/usr/share/applications/kiwix.desktop <<EOT
+busybox tar xf $TARBALL -C $PACKAGE/fs/opt
+cat > $PACKAGE/fs/usr/share/applications/kiwix.desktop <<EOT
 [Desktop Entry]
 Type=Application
 Name=Wikipedia Encyclopedia
diff -r 35a7d83513d2 -r 62d94e6800db libreoffice
--- a/libreoffice	Tue Aug 02 09:28:45 2016 +0200
+++ b/libreoffice	Wed Aug 10 14:15:08 2016 +0200
@@ -3,14 +3,6 @@
 CATEGORY="office"
 LICENSE="LGPL3"
 # end of get.list data
-#!/bin/sh
-# get-LibreOffice - install LibreOffice excl. KDE/Gnome integration & test suite.
-#
-# (C) 2010 SliTaz - GNU General Public License v3.
-# Author : Ben Arnold <ben@seawolfsanctuary.com>
-#    via : get-OpenOffice3 (Eric Joseph-Alexandre <erjo@slitaz.org>)
-#
-
 PACKAGE="LibreOffice"
 DEPENDS="cups"
 SUGGESTED="java6-jre"
@@ -60,7 +52,7 @@
 fi
 if [ ! -f $SOURCE_DIR/$TARBALL ]; then
 	rm -rf $SOURCE_DIR
-	abort_package "Could not download $TARBALL. Exiting."
+	abort_package
 fi
 
 echo -n "Extracting files (this may take a while): "
@@ -105,16 +97,16 @@
 echo -n "Preparing package... "
 
 # Make the package
-mkdir -p $PACKAGE-$VERSION/fs/usr/lib $PACKAGE-$VERSION/fs/usr/share
+USR=$PACKAGE-$VERSION/fs/usr
+mkdir -p $USR/lib $USR/share
 
 # use mv instead of 'cp -a' to save RAM
-mv opt/libreoffice* $PACKAGE-$VERSION/fs/usr/lib/libreoffice
-mv usr/share/mime $PACKAGE-$VERSION/fs/usr/share
-mv usr/share/icons $PACKAGE-$VERSION/fs/usr/share
-mv usr/bin $PACKAGE-$VERSION/fs/usr
+mv opt/libreoffice* $USR/lib/libreoffice
+mv usr/share/mime usr/share/icons $USR/share
+mv usr/bin $USR
 
 # relocalized libexec directory
-bin=$(echo $PACKAGE-$VERSION/fs/usr/bin/libreoffice${VERSION%.*})
+bin=$(echo $USR/bin/libreoffice${VERSION%.*})
 if [ -L $bin ]; then
 	target=$(readlink $bin)
 	rm -f $bin
@@ -160,5 +152,3 @@
 
 EOT
 status
-[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
-cd $tmp_dir
diff -r 35a7d83513d2 -r 62d94e6800db nanozip
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nanozip	Wed Aug 10 14:15:08 2016 +0200
@@ -0,0 +1,12 @@
+SHORT_DESC="An experimental file archiver software."
+WEB_SITE="http://nanozip.net/"
+# end of get.list data
+WGET_URL="$WEB_SITE$(wget -O - $WEB_SITE | \
+	  sed '/linux32/!d;s/.*href="*\([^>"]*\).*/\1/;q')"
+TARBALL="$(basename $WGET_URL)"
+VERSION="$(echo $TARBALL | sed 's/.*-\(.*\).linux32.*/\1/')"
+
+wget $WGET_URL
+unzip $TARBALL
+mkdir -p $PACKAGE-$VERSION/fs/usr/bin
+mv nz $PACKAGE-$VERSION/fs/usr/bin
diff -r 35a7d83513d2 -r 62d94e6800db openoffice3
--- a/openoffice3	Tue Aug 02 09:28:45 2016 +0200
+++ b/openoffice3	Wed Aug 10 14:15:08 2016 +0200
@@ -3,13 +3,6 @@
 CATEGORY="office"
 LICENSE="Apache"
 # end of get.list data
-#!/bin/sh
-# get-OpenOffice3, install everything for OpenOffice.org exept KDE/Gnome integration and testsuite.
-#
-# (C) 2008 SliTaz - GNU General Public License v3.
-#
-# Author : Eric Joseph-Alexandre <erjo@slitaz.org>
-
 PACKAGE="OpenOffice3"
 PATTERN="Linux_x86_install-rpm"
 
@@ -38,9 +31,7 @@
 	break
 done
 
-if [ -z "$VERSION" ]; then
-	abort_package "Can't find VERSION. Abort."
-fi
+[ "$VERSION" ] || abort_package "Can't find VERSION. Abort."
 echo "Selecting $DIR version $VERSION ..."
 TARBALL="$(wget -O - $MIRROR/$DIR/$VERSION/ \
 	2> /dev/null | grep $PATTERN | tail -1 | sed 's/.*href=\"\(.*\)\".*/\1/')"
@@ -64,7 +55,7 @@
 fi
 if [ ! -f $SOURCE_DIR/$TARBALL ]; then
 	rm -rf $SOURCE_DIR
-	abort_package "Could not download $TARBALL. Exiting."
+	abort_package
 fi
 
 # Creates TEMP_DIR and extract tarball
@@ -93,17 +84,16 @@
 
 
 # Make the package
-mkdir -p $PACKAGE-$VERSION/fs/usr/lib/openoffice  \
-  $PACKAGE-$VERSION/fs/usr/share
+USR=$PACKAGE-$VERSION/fs/usr
+mkdir -p $USR/lib/openoffice $USR/share
 
 # use mv instead of 'cp -a' to save RAM
-mv opt/openoffice* $PACKAGE-$VERSION/fs/usr/lib/openoffice
-mv usr/share/mime $PACKAGE-$VERSION/fs/usr/share
-mv usr/share/icons $PACKAGE-$VERSION/fs/usr/share
-mv usr/bin $PACKAGE-$VERSION/fs/usr
+mv opt/openoffice* $USR/lib/openoffice
+mv usr/share/mime usr/share/icons $USR/share
+mv usr/bin $USR
 
 # relocalized OOo libexec directory
-sed -i 's#/opt/#/usr/lib/openoffice/#'  $PACKAGE-$VERSION/fs/usr/bin/openoffice*
+sed -i 's#/opt/#/usr/lib/openoffice/#'  $USR/bin/openoffice*
 
 # Create receipt
 cat > $PACKAGE-$VERSION/receipt <<EOT
@@ -168,5 +158,3 @@
 		mv $1/fs/$file $(dirname $ROOT/$file)
 	done
 }
-[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
-cd $tmp_dir
diff -r 35a7d83513d2 -r 62d94e6800db opera
--- a/opera	Tue Aug 02 09:28:45 2016 +0200
+++ b/opera	Wed Aug 10 14:15:08 2016 +0200
@@ -17,7 +17,7 @@
 	[ -s $TARBALL ] && break
 done
 
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
@@ -31,14 +31,14 @@
 MAINTAINER="$(sed '/^Maintainer:/!d;s/.*: //' $PACKAGE/meta/control)"
 VERSION="$(sed '/^Version:/!d;s/.*: //' $PACKAGE/meta/control)"
 mv $PACKAGE $PACKAGE-$VERSION
-cd $PACKAGE-$VERSION/fs
+USR=$PACKAGE-$VERSION/fs/usr
 
 # Localized keyboard layout fix
-busybox sed "s|sh$|sh\nexport XMODIFIERS=\"@im=none\"|" -i usr/bin/opera
+busybox sed "s|sh$|sh\nexport XMODIFIERS=\"@im=none\"|" -i $USR/bin/opera
 
 # Create menu
-mkdir -p usr/share/applications
-cat > usr/share/applications/opera-browser.desktop <<EOT
+mkdir -p $USR/share/applications
+cat > $USR/share/applications/opera-browser.desktop <<EOT
 [Desktop Entry]
 Type=Application
 Name=Opera
@@ -72,16 +72,13 @@
 Icon=opera-browser
 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;
 EOT
-cd ../..
 
 # Remove unwanted locale
-mv $PACKAGE-$VERSION/fs/usr/share/opera/locale $PACKAGE-$VERSION/fs/usr/share/opera/locale-full
-mkdir -p $PACKAGE-$VERSION/fs/usr/share/opera/locale 
+mv $USR/share/opera/locale $USR/share/opera/locale-full
+mkdir -p $USR/share/opera/locale 
 . /etc/locale.conf
 for i in $LANG ${LANG/_/-} ${LANG:0:2} en fr ru pt de zh-cn ; do
-	[ -d $PACKAGE-$VERSION/fs/usr/share/opera/locale-full/$i ] &&
-	cp -a $PACKAGE-$VERSION/fs/usr/share/opera/locale-full/$i \
-		$PACKAGE-$VERSION/fs/usr/share/opera/locale
+	[ -d $USR/share/opera/locale-full/$i ] &&
+	mv $USR/share/opera/locale-full/$i $USR/share/opera/locale
 done
-rm -rf $PACKAGE-$VERSION/fs/usr/share/opera/locale-full
-rm -rf $PACKAGE-$VERSION/fs/usr/share/pixmaps
+rm -rf $USR/share/opera/locale-full $USR/share/pixmaps
diff -r 35a7d83513d2 -r 62d94e6800db palemoon
--- a/palemoon	Tue Aug 02 09:28:45 2016 +0200
+++ b/palemoon	Wed Aug 10 14:15:08 2016 +0200
@@ -15,8 +15,7 @@
 
 mkdir -p $PACKAGE-$VERSION/fs/opt
 busybox wget -O - $WGET_URL | tar -xjf - -C $PACKAGE-$VERSION/fs/opt
-[ -d $PACKAGE-$VERSION/fs/opt/palemoon ] ||
-abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -d $PACKAGE-$VERSION/fs/opt/palemoon ] || abort_package
 
 DESKTOP=$PACKAGE-$VERSION/fs/usr/share/applications/palemoon.desktop
 mkdir -p $(dirname $DESKTOP)
diff -r 35a7d83513d2 -r 62d94e6800db speedtouch-firmware
--- a/speedtouch-firmware	Tue Aug 02 09:28:45 2016 +0200
+++ b/speedtouch-firmware	Wed Aug 10 14:15:08 2016 +0200
@@ -1,7 +1,6 @@
 SHORT_DESC="Firmware for SpeedTouch ADSL Modem."
 WEB_SITE="http://www.linux-usb.org/SpeedTouch/"
 # end of get.list data
-DEPENDS=""
 
 VERSION="3.012"
 mkdir -p $PACKAGE-$VERSION/fs/lib/firmware
@@ -11,7 +10,7 @@
 #from http://www.filewatcher.com/m/SpeedTouch330_firmware_3012.zip.769125-0.html
 WGET_URL="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$TARBALL"
 wget $WGET_URL
-[ $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
+[ $TARBALL ] || abort_package
 unzip -n $(basename $WGET_URL)
 wget http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
 tar xzf firmware-extractor.tar.gz
diff -r 35a7d83513d2 -r 62d94e6800db sublime-text-3
--- a/sublime-text-3	Tue Aug 02 09:28:45 2016 +0200
+++ b/sublime-text-3	Wed Aug 10 14:15:08 2016 +0200
@@ -8,7 +8,7 @@
 TARBALL="$(basename $WGET_URL)"
 
 busybox wget $WGET_URL
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir -p $PACKAGE-$VERSION/fs/opt $PACKAGE-$VERSION/fs/usr/share/applications
 cd $PACKAGE-$VERSION/fs/opt
diff -r 35a7d83513d2 -r 62d94e6800db teamviewer
--- a/teamviewer	Tue Aug 02 09:28:45 2016 +0200
+++ b/teamviewer	Wed Aug 10 14:15:08 2016 +0200
@@ -9,7 +9,7 @@
 TARBALL="$(basename $WGET_URL)"
 wget --no-check-certificate -O $TARBALL $WGET_URL
 
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
+[ -f $TARBALL ] || abort_package
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
@@ -38,8 +38,5 @@
 	$(find opt -type f | grep /$PACKAGE$)
 mkdir -p etc/init.d
 ln -s /$(find opt | grep /teamviewerd$) etc/init.d/teamviewerd
-cd ../..
 
 # Web viewer (needs flash): https://go.teamviewer.com/v${VERSION%%.*}/
-
-cd $tmp_dir
diff -r 35a7d83513d2 -r 62d94e6800db ueagle-firmware
--- a/ueagle-firmware	Tue Aug 02 09:28:45 2016 +0200
+++ b/ueagle-firmware	Wed Aug 10 14:15:08 2016 +0200
@@ -1,7 +1,7 @@
 SHORT_DESC="Firmware for Fast800 USB ADSL Modem."
 WEB_SITE="http://eagle-usb.org/"
+VERSION="1.1"
 # end of get.list data
-DEPENDS=""
 
 wget_ueagle()
 {
@@ -15,8 +15,6 @@
 	abort_package "Could not download $1. Exiting."
 }
 
-mkdir -p $PACKAGE-$VERSION/fs/lib/firmware
-VERSION="1.1"
 TARBALL="ueagle-data-$VERSION.tar.gz"
 SOURCE="ueagle-data"
 wget_ueagle ueagle4-data-1.0.tar.gz <<EOT
@@ -30,9 +28,8 @@
 ftp://ftp.coolmax.one.pl/pub/linux/repository/pkg/linux-atm/Internet
 http://eagle-usb.org/ueagle-atm/non-free
 EOT
-mkdir -p $PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm
-cp -a ueagle-*/*.fw ueagle-*/*.bin ueagle4*/*.fw ueagle4*/*.bin* \
-	$PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm
-chown root.root $PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm/*
-ln $PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin.v2 \
-	$PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin || true
+FIRMWARE=$PACKAGE-$VERSION/fs/lib/firmware/ueagle-atm
+mkdir -p $FIRMWARE
+cp -a ueagle-*/*.fw ueagle-*/*.bin ueagle4*/*.fw ueagle4*/*.bin* $FIRMWARE
+chown root.root $FIRMWARE/*
+ln $FIRMWARE/CMV4p.bin.v2 $FIRMWARE/CMV4p.bin || true
diff -r 35a7d83513d2 -r 62d94e6800db vivaldi
--- a/vivaldi	Tue Aug 02 09:28:45 2016 +0200
+++ b/vivaldi	Wed Aug 10 14:15:08 2016 +0200
@@ -16,8 +16,9 @@
 
 # Add icons
 for size in 16 22 24 32 48 64 128 256; do
-	mkdir -p "usr/share/icons/hicolor/${size}x$size/apps"
-	ln -s /opt/vivaldi/product_logo_$size.png "usr/share/icons/hicolor/${size}x$size/apps/vivaldi.png"
+	dest="usr/share/icons/hicolor/${size}x$size/apps"
+	mkdir -p $dest
+	ln -s /opt/vivaldi/product_logo_$size.png "$dest/vivaldi.png"
 done
 mkdir -p $PACKAGE-$VERSION/fs
 mv opt usr $PACKAGE-$VERSION/fs