wok rev 3893

get-*: do not create empty packages
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Aug 14 10:01:38 2009 +0200 (2009-08-14)
parents 568d9cd63d42
children 39e9a9a762e3
files get-OpenOffice3/stuff/get-OpenOffice3 get-dropbox/stuff/get-dropbox get-dsl-firmware/stuff/get-dsl-firmware get-eclipse-pdt/stuff/get-eclipse-pdt get-flash-plugin/stuff/get-flash-plugin get-foxit-reader/stuff/get-foxit-reader get-google-chrome/stuff/get-google-chrome get-google-earth/stuff/get-google-earth get-java6-jdk/stuff/get-java6-jdk get-java6-jre/stuff/get-java6-jre get-libstdc++5/stuff/get-libstdc++5 get-linuxqq/stuff/get-linuxqq get-opera/stuff/get-opera get-rar/stuff/get-rar get-realplayer/stuff/get-realplayer get-sjphone/stuff/get-sjphone get-skype/stuff/get-skype get-texlive/stuff/get-texlive get-unace/stuff/get-unace get-upx/stuff/get-upx get-wifi-firmware/stuff/get-wifi-firmware get-wink/stuff/get-wink get-xlite/stuff/get-xlite get-xnviewmp/stuff/get-xnviewmp
line diff
     1.1 --- a/get-OpenOffice3/stuff/get-OpenOffice3	Thu Aug 13 16:44:09 2009 +0200
     1.2 +++ b/get-OpenOffice3/stuff/get-OpenOffice3	Fri Aug 14 10:01:38 2009 +0200
     1.3 @@ -29,7 +29,7 @@
     1.4  WGET_URL=ftp://ftp.proxad.net/mirrors/ftp.openoffice.org/$DIR/$VERSION/$TARBALL
     1.5  
     1.6  TEMP_DIR="/tmp/$PACKAGE.$$"
     1.7 -SOURCE_DIR="/tmp/src"
     1.8 +SOURCE_DIR="/tmp/src.$$"
     1.9  EXCLUDE="kde|gnome|test"
    1.10  LOG="/tmp/$(basename $0 .sh).log"
    1.11  
    1.12 @@ -95,6 +95,11 @@
    1.13  	wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL
    1.14  	status
    1.15  fi
    1.16 +if [ ! -f $SOURCE_DIR/$TARBALL ]; then
    1.17 +	rm -rf $SOURCE_DIR
    1.18 +	echo "Could not download $TARBALL. Exiting."
    1.19 +	exit 1
    1.20 +fi
    1.21  
    1.22  # Creates TEMP_DIR and extract tarball
    1.23  mkdir -p $TEMP_DIR
    1.24 @@ -166,5 +171,6 @@
    1.25  tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
    1.26  
    1.27  # Clean
    1.28 +rm -rf $SOURCE_DIR
    1.29  rm -rf $TEMP_DIR
    1.30  rm -rf $PACKAGE-$VERSION
     2.1 --- a/get-dropbox/stuff/get-dropbox	Thu Aug 13 16:44:09 2009 +0200
     2.2 +++ b/get-dropbox/stuff/get-dropbox	Fri Aug 14 10:01:38 2009 +0200
     2.3 @@ -30,6 +30,13 @@
     2.4  # Download the file
     2.5  wget $URL 
     2.6  
     2.7 +if [ ! -f $TARBALL ]; then
     2.8 +	echo "Could not download $TARBALL. Exiting."
     2.9 +	cd $CUR_DIR
    2.10 +	rm -rf $TEMP_DIR
    2.11 +	exit 1
    2.12 +fi
    2.13 +
    2.14  tar xzf $TARBALL
    2.15  mkdir -p $PACKAGE-$VERSION/fs/usr/lib \
    2.16  	$PACKAGE-$VERSION/fs/usr/bin \
     3.1 --- a/get-dsl-firmware/stuff/get-dsl-firmware	Thu Aug 13 16:44:09 2009 +0200
     3.2 +++ b/get-dsl-firmware/stuff/get-dsl-firmware	Fri Aug 14 10:01:38 2009 +0200
     3.3 @@ -9,17 +9,18 @@
     3.4  case "$MODULE" in
     3.5  speedtouch|speedtouch-silver|speedtch)
     3.6  	VERSION="3.012"
     3.7 +	TARBALL="SpeedTouch330_firmware_$(echo $VERSION | sed 's/\.//').zip"
     3.8  	SHORT_DESC="Firmware for SpeedTouch ADSL Modem."
     3.9  	WEB_SITE="http://www.linux-usb.org/SpeedTouch/"
    3.10 -	URL="http://www.speedtouch.com/download/drivers/USB"
    3.11 -	URL="$URL/SpeedTouch330_firmware_$(echo $VERSION | sed 's/\.//').zip"
    3.12 +	URL="http://www.speedtouch.com/download/drivers/USB/$TARBALL"
    3.13  	;;
    3.14  ueagle|ueagle-atm)
    3.15  	VERSION="1.1"
    3.16 +	TARBALL="ueagle-data-$VERSION.tar.gz"
    3.17  	SHORT_DESC="Firmware for Fast800 USB ADSL Modem."
    3.18  	SOURCE="ueagle-data"
    3.19  	WEB_SITE="http://eagle-usb.org/"
    3.20 -	URL="${WEB_SITE}ueagle-atm/non-free/ueagle-data-$VERSION.tar.gz"
    3.21 +	URL="${WEB_SITE}ueagle-atm/non-free/$TARBALL"
    3.22  	;;
    3.23  *)	echo "Unknown dsl driver. Please run one of the following commands:"
    3.24  	for i in $(cd $(dirname $0); ls get-*-firmware); do
    3.25 @@ -79,6 +80,13 @@
    3.26  	;;
    3.27  esac
    3.28  
    3.29 +if [ ! -f $TARBALL ]; then
    3.30 +	echo "Could not download $TARBALL. Exiting."
    3.31 +	cd $TOP
    3.32 +	rm -rf $TMP
    3.33 +	exit 1
    3.34 +fi
    3.35 +
    3.36  # Create receipt
    3.37  cat > $PKG-$VERSION/receipt <<EOT
    3.38  PACKAGE="$PKG"
     4.1 --- a/get-eclipse-pdt/stuff/get-eclipse-pdt	Thu Aug 13 16:44:09 2009 +0200
     4.2 +++ b/get-eclipse-pdt/stuff/get-eclipse-pdt	Fri Aug 14 10:01:38 2009 +0200
     4.3 @@ -78,7 +78,12 @@
     4.4  	status
     4.5  fi
     4.6  
     4.7 -
     4.8 +if [ ! -f $SOURCE_DIR/$TARBALL ]; then
     4.9 +	rm -rf $TEMP_DIR
    4.10 +	rm -rf $PACKAGE-$VERSION
    4.11 +	echo "Could not download $TARBALL. Exiting."
    4.12 +	exit 1
    4.13 +fi
    4.14  
    4.15  # Creates TEM_DIR and extract tarball
    4.16  mkdir -p $TEMP_DIR
     5.1 --- a/get-flash-plugin/stuff/get-flash-plugin	Thu Aug 13 16:44:09 2009 +0200
     5.2 +++ b/get-flash-plugin/stuff/get-flash-plugin	Fri Aug 14 10:01:38 2009 +0200
     5.3 @@ -46,6 +46,11 @@
     5.4  DIR=install_flash_player_${value}_linux
     5.5  TARBALL=$DIR.tar.gz
     5.6  [ -f $TARBALL ] || wget $URL$TARBALL
     5.7 +if [ ! -f $TARBALL ]; then
     5.8 +	echo "Could not download $TARBALL. Exiting."
     5.9 +	exit 1
    5.10 +fi
    5.11 +
    5.12  
    5.13  # Extract
    5.14  mkdir $DIR
     6.1 --- a/get-foxit-reader/stuff/get-foxit-reader	Thu Aug 13 16:44:09 2009 +0200
     6.2 +++ b/get-foxit-reader/stuff/get-foxit-reader	Fri Aug 14 10:01:38 2009 +0200
     6.3 @@ -29,6 +29,12 @@
     6.4  
     6.5  # Download the file
     6.6  wget $URL 
     6.7 +if [ ! -f $RPMPKG ]; then
     6.8 +	cd $CUR_DIR
     6.9 +	rm -rf $TEMP_DIR
    6.10 +	echo "Could not download $RPMPKG. Exiting."
    6.11 +	exit 1
    6.12 +fi
    6.13  
    6.14  rpm2cpio $RPMPKG | cpio -dium
    6.15  mkdir -p $PACKAGE-$VERSION/fs
     7.1 --- a/get-google-chrome/stuff/get-google-chrome	Thu Aug 13 16:44:09 2009 +0200
     7.2 +++ b/get-google-chrome/stuff/get-google-chrome	Fri Aug 14 10:01:38 2009 +0200
     7.3 @@ -27,6 +27,12 @@
     7.4  
     7.5  # Download the file
     7.6  wget $URL 
     7.7 +if [ ! -f $DEBPKG ]; then
     7.8 +	cd $CUR_DIR
     7.9 +	rm -rf $TEMP_DIR
    7.10 +	echo "Could not download $DEBPKG. Exiting."
    7.11 +	exit 1
    7.12 +fi
    7.13  
    7.14  ar x $DEBPKG control.tar.gz data.tar.lzma && lzma d data.tar.lzma -so | tar xf -
    7.15  tar xzf control.tar.gz ./control
     8.1 --- a/get-google-earth/stuff/get-google-earth	Thu Aug 13 16:44:09 2009 +0200
     8.2 +++ b/get-google-earth/stuff/get-google-earth	Fri Aug 14 10:01:38 2009 +0200
     8.3 @@ -21,6 +21,13 @@
     8.4  
     8.5  # Download tarball
     8.6  wget http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
     8.7 +if [ ! -f GoogleEarthLinux.bin ]; then
     8.8 +	cd $CUR_DIR
     8.9 +	rm -rf $TMP_DIR
    8.10 +	echo "Could not download GoogleEarthLinux.bin. Exiting."
    8.11 +	exit 1
    8.12 +fi
    8.13 +
    8.14  chmod +x GoogleEarthLinux.bin
    8.15  sed -i 's/bzip2 -d/bunzip2/g' GoogleEarthLinux.bin
    8.16  
     9.1 --- a/get-java6-jdk/stuff/get-java6-jdk	Thu Aug 13 16:44:09 2009 +0200
     9.2 +++ b/get-java6-jdk/stuff/get-java6-jdk	Fri Aug 14 10:01:38 2009 +0200
     9.3 @@ -33,11 +33,19 @@
     9.4  
     9.5  
     9.6  # Create TEMP_DIR
     9.7 +CUR_DIR=$(pwd)
     9.8  test -d $TEMP_DIR || mkdir $TEMP_DIR
     9.9  cd $TEMP_DIR
    9.10  
    9.11  # Download the file
    9.12  test -f $TARBALL || wget $URL/$TARBALL
    9.13 +if [ ! -f $TARBALL ]; then
    9.14 +	cd $CUR_DIR
    9.15 +	rm -rf $TMP_DIR
    9.16 +	echo "Could not download $TARBALL. Exiting."
    9.17 +	exit 1
    9.18 +fi
    9.19 +
    9.20  # Do not trust 'df' free space
    9.21  sed -i 's/exit 3$//' $TARBALL
    9.22  
    9.23 @@ -96,7 +104,7 @@
    9.24  tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
    9.25  
    9.26  # Clean
    9.27 -cd /tmp
    9.28 +cd $CUR_DIR
    9.29  rm -rf $TEMP_DIR
    9.30  
    9.31  
    10.1 --- a/get-java6-jre/stuff/get-java6-jre	Thu Aug 13 16:44:09 2009 +0200
    10.2 +++ b/get-java6-jre/stuff/get-java6-jre	Fri Aug 14 10:01:38 2009 +0200
    10.3 @@ -28,11 +28,18 @@
    10.4  
    10.5  
    10.6  # Create TEMP_DIR
    10.7 +CUR_DIR=$(pwd)
    10.8  test -d $TEMP_DIR || mkdir $TEMP_DIR
    10.9  cd $TEMP_DIR
   10.10  
   10.11  # Doanload the file
   10.12  test -f $TARBALL || wget $URL -O $TARBALL
   10.13 +if [ ! -f $TARBALL ]; then
   10.14 +	cd $CUR_DIR
   10.15 +	rm -rf $TEMP_DIR
   10.16 +	echo "Could not download $TARBALL. Exiting."
   10.17 +	exit 1
   10.18 +fi
   10.19  
   10.20  # Do not trust 'df' free space
   10.21  sed -i 's/exit 3$//' $TARBALL
   10.22 @@ -87,11 +94,5 @@
   10.23  tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
   10.24  
   10.25  # Clean
   10.26 -cd /tmp
   10.27 +cd $CUR_DIR
   10.28  rm -rf $TEMP_DIR
   10.29 -
   10.30 -
   10.31 -
   10.32 -
   10.33 -
   10.34 -
    11.1 --- a/get-libstdc++5/stuff/get-libstdc++5	Thu Aug 13 16:44:09 2009 +0200
    11.2 +++ b/get-libstdc++5/stuff/get-libstdc++5	Fri Aug 14 10:01:38 2009 +0200
    11.3 @@ -33,6 +33,12 @@
    11.4  	DEB=$(basename $i)
    11.5  	wget $i && break
    11.6  done
    11.7 +if [ ! -f $DEB ]; then
    11.8 +	cd $CUR_DIR
    11.9 +	rm -rf $TMP_DIR
   11.10 +	echo "Could not download $DEB. Exiting."
   11.11 +	exit 1
   11.12 +fi
   11.13  
   11.14  VERSION=$(echo $DEB  | sed 's/.*_\(.*\)_.*/\1/')
   11.15  
    12.1 --- a/get-linuxqq/stuff/get-linuxqq	Thu Aug 13 16:44:09 2009 +0200
    12.2 +++ b/get-linuxqq/stuff/get-linuxqq	Fri Aug 14 10:01:38 2009 +0200
    12.3 @@ -29,6 +29,12 @@
    12.4  
    12.5  # Download the file
    12.6  wget $URL 
    12.7 +if [ ! -f $RPMPKG ]; then
    12.8 +	cd $CUR_DIR
    12.9 +	rm -rf $TEMP_DIR
   12.10 +	echo "Could not download $RPMPKG. Exiting."
   12.11 +	exit 1
   12.12 +fi
   12.13  
   12.14  rpm2cpio $RPMPKG | cpio -dium
   12.15  mkdir -p $PACKAGE-$VERSION/fs
    13.1 --- a/get-opera/stuff/get-opera	Thu Aug 13 16:44:09 2009 +0200
    13.2 +++ b/get-opera/stuff/get-opera	Fri Aug 14 10:01:38 2009 +0200
    13.3 @@ -31,6 +31,12 @@
    13.4  FILE=$(wget -O - $URL 2> /dev/null | grep rpm | sed 's|.*href="\(.*\)".*|\1|')
    13.5  URL=$URL$FILE
    13.6  wget $URL
    13.7 +if [ ! -f $FILE ]; then
    13.8 +	cd $CUR_DIR
    13.9 +	rm -rf $TMP_DIR
   13.10 +	echo "Could not download $FILE. Exiting."
   13.11 +	exit 1
   13.12 +fi
   13.13  
   13.14  VERSION=$(rpm -qip $FILE  | awk '/^Version/ { print $3 }')-$RELEASE
   13.15  
    14.1 --- a/get-rar/stuff/get-rar	Thu Aug 13 16:44:09 2009 +0200
    14.2 +++ b/get-rar/stuff/get-rar	Fri Aug 14 10:01:38 2009 +0200
    14.3 @@ -29,6 +29,12 @@
    14.4  
    14.5  # Download tarball
    14.6  wget $WGET_URL
    14.7 +if [ ! -f $TARBALL ]; then
    14.8 +	cd $BASE
    14.9 +	rm -rf $DIR
   14.10 +	echo "Could not download $TARBALL. Exiting."
   14.11 +	exit 1
   14.12 +fi
   14.13  
   14.14  # Extract
   14.15  tar xzf $TARBALL
    15.1 --- a/get-realplayer/stuff/get-realplayer	Thu Aug 13 16:44:09 2009 +0200
    15.2 +++ b/get-realplayer/stuff/get-realplayer	Fri Aug 14 10:01:38 2009 +0200
    15.3 @@ -29,6 +29,12 @@
    15.4  
    15.5  # Download the file
    15.6  wget $URL 
    15.7 +if [ ! -f $TARBALL ]; then
    15.8 +	cd $CUR_DIR
    15.9 +	rm -rf $TEMP_DIR
   15.10 +	echo "Could not download $TARBALL. Exiting."
   15.11 +	exit 1
   15.12 +fi
   15.13  
   15.14  # Run the install. --help for options. Unable to surpress mozilla plugins install?
   15.15  chmod +x  $TARBALL
    16.1 --- a/get-sjphone/stuff/get-sjphone	Thu Aug 13 16:44:09 2009 +0200
    16.2 +++ b/get-sjphone/stuff/get-sjphone	Fri Aug 14 10:01:38 2009 +0200
    16.3 @@ -16,7 +16,8 @@
    16.4  
    16.5  WEB_SITE="http://www.sjlabs.com/"
    16.6  VERSION="1.60.299"
    16.7 -URL="http://www.sjphone.org/softphone/SJphoneLnx-299a.tar.gz"
    16.8 +TARBALL="SJphoneLnx-299a.tar.gz"
    16.9 +URL="http://www.sjphone.org/softphone/$TARBALL"
   16.10  
   16.11  TMP_DIR=/tmp/get-sjphone-$$-$RANDOM
   16.12  CUR_DIR=$(pwd)
   16.13 @@ -24,9 +25,15 @@
   16.14  
   16.15  # Download tarball
   16.16  wget $URL
   16.17 +if [ ! -f $TARBALL ]; then
   16.18 +	cd $CUR_DIR
   16.19 +	rm -rf $TMP_DIR
   16.20 +	echo "Could not download $TARBALL. Exiting."
   16.21 +	exit 1
   16.22 +fi
   16.23  
   16.24  # Extract
   16.25 -tar xzf $(basename $URL)
   16.26 +tar xzf $TARBALL
   16.27  
   16.28  # Install files
   16.29  dir=sjphone-$VERSION/fs
    17.1 --- a/get-skype/stuff/get-skype	Thu Aug 13 16:44:09 2009 +0200
    17.2 +++ b/get-skype/stuff/get-skype	Fri Aug 14 10:01:38 2009 +0200
    17.3 @@ -17,10 +17,15 @@
    17.4  
    17.5  # Download tarball
    17.6  WEB_SITE="http://www.skype.com/"
    17.7 -wget ${WEB_SITE}go/getskype-linux-static
    17.8 +TARBALL="getskype-linux-static"
    17.9 +wget ${WEB_SITE}go/$TARBALL
   17.10 +if [ ! -f $TARBALL ]; then
   17.11 +	echo "Could not download $TARBALL. Exiting."
   17.12 +	exit 1
   17.13 +fi
   17.14  
   17.15  # Extract
   17.16 -TARBALL=$(ls getskype-linux-static skype*.tar.bz2 2> /dev/null || true)
   17.17 +TARBALL=$(ls $TARBALL skype*.tar.bz2 2> /dev/null || true)
   17.18  tar xjf $TARBALL
   17.19  VERSION=$(ls -d skype_static-*/)
   17.20  VERSION=${VERSION%/}
    18.1 --- a/get-texlive/stuff/get-texlive	Thu Aug 13 16:44:09 2009 +0200
    18.2 +++ b/get-texlive/stuff/get-texlive	Fri Aug 14 10:01:38 2009 +0200
    18.3 @@ -44,9 +44,15 @@
    18.4  # Get files
    18.5  echo -e "\033[1;33m Getting $PACKAGE install script\033[0m"
    18.6  wget $WGET_URL
    18.7 +if [ ! -f $TARBALL ]; then
    18.8 +	cd $TOP
    18.9 +	rm -rf $TMP
   18.10 +	echo "Could not download $TARBALL. Exiting."
   18.11 +	exit 1
   18.12 +fi
   18.13 +
   18.14  tar -xzf $TARBALL
   18.15  
   18.16 -
   18.17  # launch texlive install script
   18.18  echo -e "\033[1;33m Launching $PACKAGE install script\033[0m" 
   18.19  cd $SOURCE
    19.1 --- a/get-unace/stuff/get-unace	Thu Aug 13 16:44:09 2009 +0200
    19.2 +++ b/get-unace/stuff/get-unace	Fri Aug 14 10:01:38 2009 +0200
    19.3 @@ -30,6 +30,12 @@
    19.4  
    19.5  # Download tarball
    19.6  wget $WGET_URL
    19.7 +if [ ! -f $TARBALL ]; then
    19.8 +	cd $BASE
    19.9 +	rm -rf $DIR
   19.10 +	echo "Could not download $TARBALL. Exiting."
   19.11 +	exit 1
   19.12 +fi
   19.13  
   19.14  # Extract
   19.15  tar xzf $TARBALL
    20.1 --- a/get-upx/stuff/get-upx	Thu Aug 13 16:44:09 2009 +0200
    20.2 +++ b/get-upx/stuff/get-upx	Fri Aug 14 10:01:38 2009 +0200
    20.3 @@ -25,6 +25,12 @@
    20.4  
    20.5  # Download tarball
    20.6  wget $WGET_URL
    20.7 +if [ ! -f $TARBALL ]; then
    20.8 +	cd $BASE
    20.9 +	rm -rf $DIR
   20.10 +	echo "Could not download $TARBALL. Exiting."
   20.11 +	exit 1
   20.12 +fi
   20.13  
   20.14  # Extract
   20.15  tar xjf $TARBALL
    21.1 --- a/get-wifi-firmware/stuff/get-wifi-firmware	Thu Aug 13 16:44:09 2009 +0200
    21.2 +++ b/get-wifi-firmware/stuff/get-wifi-firmware	Fri Aug 14 10:01:38 2009 +0200
    21.3 @@ -113,13 +113,21 @@
    21.4  TOP=$PWD
    21.5  cd $TMP
    21.6  wget $WGET_URL
    21.7 +TARBALL="$(basename $WGET_URL)"
    21.8 +if [ ! -f $TARBALL ]; then
    21.9 +	cd $TOP
   21.10 +	rm -rf $DIR
   21.11 +	echo "Could not download $TARBALL. Exiting."
   21.12 +	exit 1
   21.13 +fi
   21.14 +
   21.15  case "$WGET_URL" in
   21.16 -*rpm)	rpm2cpio < $(basename $WGET_URL) | cpio -id;;
   21.17 -*deb)	dpkg-deb -x $(basename $WGET_URL) . ;;
   21.18 -*bz2)	tar xjf $(basename $WGET_URL)
   21.19 +*rpm)	rpm2cpio < $TARBALL | cpio -id;;
   21.20 +*deb)	dpkg-deb -x $TARBALL . ;;
   21.21 +*bz2)	tar xjf TARBALL
   21.22  	cd $SUBDIR/driver;;
   21.23 -*tar.gz|*tgz)	tar xzf $(basename $WGET_URL);;
   21.24 -*zip)	unzip $(basename $WGET_URL);;
   21.25 +*tar.gz|*tgz)	tar xzf $TARBALL;;
   21.26 +*zip)	unzip $TARBALL;;
   21.27  *o)	;;
   21.28  esac
   21.29  	
    22.1 --- a/get-wink/stuff/get-wink	Thu Aug 13 16:44:09 2009 +0200
    22.2 +++ b/get-wink/stuff/get-wink	Fri Aug 14 10:01:38 2009 +0200
    22.3 @@ -33,6 +33,12 @@
    22.4  	TARBALL=$(basename $i)
    22.5  	wget $i && break
    22.6  done
    22.7 +if [ ! -f $TARBALL ]; then
    22.8 +	cd $CUR_DIR
    22.9 +	rm -rf $TMP_DIR
   22.10 +	echo "Could not download $TARBALL. Exiting."
   22.11 +	exit 1
   22.12 +fi
   22.13  
   22.14  VERSION=${TARBALL%.*}
   22.15  VERSION=${VERSION%.tar}
    23.1 --- a/get-xlite/stuff/get-xlite	Thu Aug 13 16:44:09 2009 +0200
    23.2 +++ b/get-xlite/stuff/get-xlite	Fri Aug 14 10:01:38 2009 +0200
    23.3 @@ -16,7 +16,6 @@
    23.4  
    23.5  WEB_SITE="http://www.counterpath.net/"
    23.6  URL="http://counterpath.s3.amazonaws.com/downloads/X-Lite_Install.tar.gz"
    23.7 -URLLIB="http://http.us.debian.org/debian/pool/main/g/gcc-3.3/libstdc++5_3.3.6-18_i386.deb"
    23.8  
    23.9  TMP_DIR=/tmp/get-xlite-$$-$RANDOM
   23.10  CUR_DIR=$(pwd)
   23.11 @@ -24,7 +23,13 @@
   23.12  
   23.13  # Download tarball
   23.14  wget $URL
   23.15 -wget $URLLIB
   23.16 +TARBALL="$(basename $URL)"
   23.17 +if [ ! -f $TARBALL ]; then
   23.18 +	cd $CUR_DIR
   23.19 +	rm -rf $TMP_DIR
   23.20 +	echo "Could not download $TARBALL. Exiting."
   23.21 +	exit 1
   23.22 +fi
   23.23  
   23.24  # Extract
   23.25  tar xzf $(basename $URL)
   23.26 @@ -46,8 +51,6 @@
   23.27  Type=Application
   23.28  Categories=Application;Network;
   23.29  EOT
   23.30 -dpkg-deb -x $(basename $URLLIB) $dir
   23.31 -rm -rf $dir/usr/share/doc
   23.32  
   23.33  # Create pseudo package
   23.34  cat > xlite-$VERSION/receipt <<EOT
   23.35 @@ -59,7 +62,7 @@
   23.36  DEPENDS="atk cairo expat fontconfig freetype glib gtk+ libglade libpng libxml2 \
   23.37  pango pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
   23.38  xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXft \
   23.39 -xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
   23.40 +xorg-libXinerama xorg-libXrandr xorg-libXrender zlib libstdc++5"
   23.41  EOT
   23.42  
   23.43  # Pack
    24.1 --- a/get-xnviewmp/stuff/get-xnviewmp	Thu Aug 13 16:44:09 2009 +0200
    24.2 +++ b/get-xnviewmp/stuff/get-xnviewmp	Fri Aug 14 10:01:38 2009 +0200
    24.3 @@ -18,6 +18,11 @@
    24.4  # Download tarball
    24.5  WEB_SITE="http://download.xnview.com"
    24.6  wget ${WEB_SITE}/XnViewMP-linux.tgz
    24.7 +if [ ! -f $TARBALL ]; then
    24.8 +	rm -rf XnViewMP
    24.9 +	echo "Could not download $TARBALL. Exiting."
   24.10 +	exit 1
   24.11 +fi
   24.12  
   24.13  # Extract
   24.14  TARBALL=$(ls XnView*.tgz 2> /dev/null || true)