[Lunar-commits] r25462 - moonbase/trunk/x11-apps/openoffice-bin

[Auke Kok]

Author: sofar
Date: 2007-08-15 17:16:57 +0200 (Wed, 15 Aug 2007)
New Revision: 25462

Modified:
   moonbase/trunk/x11-apps/openoffice-bin/BUILD
   moonbase/trunk/x11-apps/openoffice-bin/DETAILS
Log:
Cleanups only, add error-handling


From:  sofar at foo-projects.org


Modified: moonbase/trunk/x11-apps/openoffice-bin/BUILD
===================================================================
--- moonbase/trunk/x11-apps/openoffice-bin/BUILD	2007-08-15 15:15:03 UTC (rev 25461)
+++ moonbase/trunk/x11-apps/openoffice-bin/BUILD	2007-08-15 15:16:57 UTC (rev 25462)
@@ -2,42 +2,40 @@
   OO_INSTALL_DIR="${SOURCE_DIRECTORY}/RPMS"
   OO_DESK_DIR="${SOURCE_DIRECTORY}/desktop-integration/usr"
   OO_DIR="/opt/lunar/openoffice/openoffice.org2.2"
-  
+
   cd $OO_INSTALL_DIR  &&
 
   if [ "$USE_DESKTOPINTEGRATION" = "y" ] ; then
 
-    mv ${OO_INSTALL_DIR}/desktop-integration ${SOURCE_DIRECTORY}/
+    mv ${OO_INSTALL_DIR}/desktop-integration ${SOURCE_DIRECTORY}/ &&
+    cd ${SOURCE_DIRECTORY}/desktop-integration/ &&
 
-    cd ${SOURCE_DIRECTORY}/desktop-integration 
+    INT_FILE=openoffice.org-freedesktop-menus-2.2-9153.noarch &&
 
-    INT_FILE=openoffice.org-freedesktop-menus-2.2-9153.noarch
+    rpm2cpio $INT_FILE.rpm > $INT_FILE.cpio &&
+    cpio -idm < $INT_FILE.cpio &&
 
-    rpm2cpio $INT_FILE.rpm > $INT_FILE.cpio
-    cpio -idm < $INT_FILE.cpio
-    
-    sedit "s/\/etc\/openoffice.org2.2/\/opt\/lunar\/openoffice\/openoffice.org2.2/g" ${OO_DESK_DIR}/bin/openoffice.org2.2
-    sedit "s/\/etc\/openoffice.org2.2/\/opt\/lunar\/openoffice\/openoffice.org2.2/g" ${OO_DESK_DIR}/bin/openoffice.org2.2-printeradmin
+    sedit "s|/etc/openoffice.org2.2|$OO_DIR|g" ${OO_DESK_DIR}/bin/openoffice.org2.2 &&
+    sedit "s|/etc/openoffice.org2.2|$OO_DIR|g" ${OO_DESK_DIR}/bin/openoffice.org2.2-printeradmin || exit 1
   fi  &&
 
 
   cd $OO_INSTALL_DIR &&
-
   rm -rf desktop-integration &&
 
   # Let the magic happen. Ugh, I hate rpm
   message "${MESSAGE_COLOR}Unpacking RPMs...${DEFAULT_COLOR}" &&
   for pack in ${OO_INSTALL_DIR}/*; do
-    rpm2cpio $pack > `basename $pack .rpm`.cpio
+    rpm2cpio $pack > `basename $pack .rpm`.cpio || exit 1
   done  &> /dev/null
 
   # Now, lets get rid of the rpms
   rm -rf ${OO_INSTALL_DIR}/*.rpm &&
-  
+
   for pack in ${OO_INSTALL_DIR}/*; do
-    cpio -idm < $pack &> /dev/null
+    cpio -idm < $pack &> /dev/null || exit 1
   done &&
-  
+
   prepare_install  &&
   message "${MESSAGE_COLOR}Installing OpenOffice ${VERSION}...${DEFAULT_COLOR}"  &&
   mkdir -p /opt/lunar/openoffice  &&
@@ -45,7 +43,7 @@
 
   if [ "$USE_DESKTOPINTEGRATION" = "y" ] ; then
     install -m755 ${OO_DESK_DIR}/bin/openoffice.org2.2 \
-                  ${OO_DESK_DIR}/bin/openoffice.org2.2-printeradmin /usr/bin/
+                  ${OO_DESK_DIR}/bin/openoffice.org2.2-printeradmin /usr/bin/ &&
 
     # Install icons for the .desktop files
     mkdir -p -m0755 /usr/share/icons/{gnome,hicolor} &&
@@ -54,15 +52,15 @@
     cp -r hicolor/*x* /usr/share/icons/hicolor &&
     gtk-update-icon-cache --force /usr/share/icons/hicolor &&
 
-    install -m644 "${OO_DESK_DIR}/share/mime/packages/openoffice.org.xml" /usr/share/mime/packages/
-    update-mime-database /usr/share/mime/ &> /dev/null
+    install -m644 "${OO_DESK_DIR}/share/mime/packages/openoffice.org.xml" /usr/share/mime/packages/ &&
+    update-mime-database /usr/share/mime/ &> /dev/null &&
 
-    DESKTOP_FILES="base calc draw impress math printeradmin writer"
+    DESKTOP_FILES="base calc draw impress math printeradmin writer" &&
 
     for FILE in ${DESKTOP_FILES} ; do
       ln -s ${OO_DIR}/share/xdg/${FILE}.desktop \
-        /usr/share/applications/${FILE}.desktop
+        /usr/share/applications/${FILE}.desktop || exit 1
     done
-  fi
+  fi || exit 1
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/x11-apps/openoffice-bin/DETAILS
===================================================================
--- moonbase/trunk/x11-apps/openoffice-bin/DETAILS	2007-08-15 15:15:03 UTC (rev 25461)
+++ moonbase/trunk/x11-apps/openoffice-bin/DETAILS	2007-08-15 15:16:57 UTC (rev 25462)
@@ -1,5 +1,5 @@
           MODULE=openoffice-bin
-         VERSION=2.2.1 
+         VERSION=2.2.1
           SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOF680_m18_native_packed-1_en-US.9161
    SOURCE_URL[0]=http://ftp.ussg.iu.edu/openoffice/stable/$VERSION/