[Lunar-commits] <moonbase> firefox4: fix error-handling chain

[Paul Bredbury]

commit ecaa71defdccbf8d64fb502a5d62b74bd7b5253b
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Wed Jan 12 19:02:32 2011 +0700

    firefox4: fix error-handling chain
---
 web/firefox4/BUILD |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/web/firefox4/BUILD b/web/firefox4/BUILD
index 45aafdb..7a43ed5 100644
--- a/web/firefox4/BUILD
+++ b/web/firefox4/BUILD
@@ -1,33 +1,33 @@
 (
 
-  MOZILLA_DIR=mozilla-central
+  MOZILLA_DIR=mozilla-central  &&
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi  &&
 
-  export MOZILLA_HOME=/usr/lib/firefox-$VERSION
-  export MOZ_CO_PROJECT=browser
-  export MOZILLA_OFFICIAL=1
-  export BUILD_OFFICIAL=1
+  export MOZILLA_HOME=/usr/lib/firefox-$VERSION  &&
+  export MOZ_CO_PROJECT=browser  &&
+  export MOZILLA_OFFICIAL=1  &&
+  export BUILD_OFFICIAL=1  &&
 
   # This should always be just a link
   rm -rf $MOZILLA_HOME/plugins  &&
 
   cp $SCRIPT_DIRECTORY/mozconfig $MOZILLA_DIR/  &&
 
-  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
+  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
   mkdir -p ${MOZ_OBJDIR}  &&
 
   cd $MOZILLA_DIR  &&
 
-  echo "ac_add_options --disable-necko-wifi" >> mozconfig
-  echo "ac_add_options --disable-system-sqlite" >> mozconfig
+  echo "ac_add_options --disable-necko-wifi" >> mozconfig  &&
+  echo "ac_add_options --disable-system-sqlite" >> mozconfig  &&
 
   #Add DEPENDS options
 
   if in_depends $MODULE "xulrunner" ; then
-    XUL=`module_version xulrunner`
+    XUL=`module_version xulrunner`  &&
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
   fi  &&
 
@@ -38,8 +38,8 @@
   fi  &&
 
   if in_depends $MODULE sun-jdk ; then
-    echo "ac_add_options --with-java-include-path=/usr/java/default/include" >> mozconfig
-    echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig
+    echo "ac_add_options --with-java-include-path=/usr/java/default/include" >> mozconfig  &&
+    echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig  &&
     echo "ac_add_options --enable-javaxpcom" >> mozconfig
   fi  &&
 
@@ -54,7 +54,7 @@
   #Finally, the build!
   if [ "$PGO" == "y" ] ; then
     #CCache breaks the pgo build
-    export CCACHE_DISABLE=1
+    export CCACHE_DISABLE=1  &&
     echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig  &&
     echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig  &&
     make -f client.mk build &&
@@ -65,7 +65,7 @@
 
   cd ${MOZ_OBJDIR}  &&
   prepare_install   &&
-  make install      &&
+  make install      || exit 1
 
   # Put some important headers in place
   mkdir -p /usr/include/firefox-$VERSION/nss  &&
@@ -85,7 +85,7 @@
   install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications  &&
   # please, dont just let the lin fail because /usr/share/pixmaps/firefox48.png is an existing symlink...
   rm -f /usr/share/pixmaps/firefox48.png  &&
-  install -m644 $MOZILLA_HOME/chrome/icons/default/default48.png /usr/share/pixmaps/firefox48.png  &&
+  install -m644 $MOZILLA_HOME/chrome/icons/default/default48.png /usr/share/pixmaps/firefox48.png  || exit 1
 
   # Make firefox use its own icon
   for icon in `ls $MOZILLA_HOME/icons`; do