pidgin: fb76a1cd: Improve error handling
datallah at pidgin.im
datallah at pidgin.im
Fri May 21 17:30:51 EDT 2010
-----------------------------------------------------------------
Revision: fb76a1cdbe11d4297b67af0a12356362323f60c5
Ancestor: 4bb4597be5ca1b5c3b900fd4910af2548d88877b
Author: datallah at pidgin.im
Date: 2010-05-21T21:28:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fb76a1cdbe11d4297b67af0a12356362323f60c5
Modified files:
pidgin/win32/nsis/generate_gtk_zip.sh
ChangeLog:
Improve error handling
-------------- next part --------------
============================================================
--- pidgin/win32/nsis/generate_gtk_zip.sh 58792db7f6610c13cee15f47e654bcc4cf935d88
+++ pidgin/win32/nsis/generate_gtk_zip.sh 92ff2c0ade607716d4f6ea8751473a4a7da4b4c9
@@ -45,14 +45,15 @@ function download_and_extract {
FILE=$(basename $URL)
if [ ! -e $FILE ]; then
echo Downloading $NAME
- wget $URL
+ wget $URL || return 1
fi
EXTENSION=${FILE##*.}
#This is an OpenSuSE build service RPM
if [ $EXTENSION == 'rpm' ]; then
+ echo "Generating zip from $FILE"
FILE=$(../rpm2zip.sh $FILE)
fi
- unzip -q $FILE -d $INSTALL_DIR
+ unzip -q $FILE -d $INSTALL_DIR || exit 1
echo "$NAME" >> $CONTENTS_FILE
}
@@ -78,3 +79,5 @@ zip -9 -r ../gtk-runtime-$BUNDLE_VERSION
#Generate zip file to be included in installer
zip -9 -r ../gtk-runtime-$BUNDLE_VERSION.zip Gtk
+exit 0
+
More information about the Commits
mailing list