[Lunar-commits] r24292 - moonbase/trunk/web/seamonkey

[Zbigniew Luszpinski]

Author: zbiggy
Date: 2007-05-03 04:36:06 +0200 (Thu, 03 May 2007)
New Revision: 24292

Modified:
   moonbase/trunk/web/seamonkey/BUILD
   moonbase/trunk/web/seamonkey/POST_INSTALL
Log:
The problem with plugins is now fixed.


Modified: moonbase/trunk/web/seamonkey/BUILD
===================================================================
--- moonbase/trunk/web/seamonkey/BUILD	2007-05-02 19:26:08 UTC (rev 24291)
+++ moonbase/trunk/web/seamonkey/BUILD	2007-05-03 02:36:06 UTC (rev 24292)
@@ -58,8 +58,6 @@
 	/usr/include/seamonkey-$VERSION/nss &&
 
      mkdir -p /opt/lunar/plugins		&&
-         for plugin in `ls /usr/lib/seamonkey-$VERSION/plugins`; do
-	     `install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins/`; done  &&
 
 install -d /usr/share/applications /usr/share/pixmaps &&
 install -m644 $SCRIPT_DIRECTORY/seamonkey.desktop /usr/share/applications &&

Modified: moonbase/trunk/web/seamonkey/POST_INSTALL
===================================================================
--- moonbase/trunk/web/seamonkey/POST_INSTALL	2007-05-02 19:26:08 UTC (rev 24291)
+++ moonbase/trunk/web/seamonkey/POST_INSTALL	2007-05-03 02:36:06 UTC (rev 24292)
@@ -8,8 +8,15 @@
 fi
 
 unset_module_config OLD_VER
-cp /usr/lib/$SMNKEY_LIBDIR/plugins/* /opt/lunar/plugins/
-rm -rf /usr/lib/$SMNKEY_LIBDIR/plugins
+
+if [ -h /usr/lib/$SMNKEY_LIBDIR/plugins ]; then
+rm -f /usr/lib/$SMNKEY_LIBDIR/plugins
+else
+for plugin in `ls /usr/lib/seamonkey-$VERSION/plugins`; do
+`install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins/`; done
+rm -rf /usr/lib/$SMNKEY_LIBDIR/plugins		      
+fi
+
 ln -snf /opt/lunar/plugins /usr/lib/$SMNKEY_LIBDIR/plugins
 
 export LD_LIBRARY_PATH="/usr/lib/$SMNKEY_LIBDIR:/opt/lunar/plugins:/usr/lib/$SMNKEY_LIBDIR/components"
@@ -19,7 +26,9 @@
 cd /usr/lib/$SMNKEY_LIBDIR
 ./regxpcom
 # Added the symlinks back now that zbiggy has removed mozilla from moonbase
-ln -sf /usr/lib/$SMNKEY_LIBDIR /usr/lib/mozilla
-ln -sf /usr/include/$SMNKEY_LIBDIR /usr/include/mozilla
+rm -f /usr/lib/mozilla
+ln -snf /usr/lib/$SMNKEY_LIBDIR /usr/lib/mozilla
+rm -f /usr/include/mozilla
+ln -snf /usr/include/$SMNKEY_LIBDIR /usr/include/mozilla
 ln -sf /usr/bin/seamonkey /usr/bin/mozilla
 ln -sf /usr/bin/seamonkey-config /usr/bin/mozilla-config