[Lunar-commits] <moonbase> firefox-bin: fixed conflicts and build

[Zbigniew Luszpinski]

commit afafd4cf3479f193a7f8b376d6528e554d42c825
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Jun 24 22:06:07 2011 +0200

    firefox-bin: fixed conflicts and build
---
 web/firefox-bin/BUILD           |   29 ++++-------------------------
 web/firefox-bin/firefox.desktop |   11 -----------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/web/firefox-bin/BUILD b/web/firefox-bin/BUILD
index 71f7bb6..17aabe5 100644
--- a/web/firefox-bin/BUILD
+++ b/web/firefox-bin/BUILD
@@ -5,34 +5,13 @@
   cd /opt/lunar   &&
   unpack $SOURCE  &&
 
-  # Install the plugins in the right directories
-  mkdir -p /opt/lunar/plugins  &&
-  for plugin in `ls /opt/lunar/firefox/plugins`; do
-       `install -m755 /opt/lunar/firefox/plugins/$plugin /opt/lunar/plugins`; done  &&
-
-  rm -rf /opt/lunar/firefox/plugins  &&
   ln -snf /opt/lunar/plugins /opt/lunar/firefox/plugins  &&
   if [ ! -h /usr/bin/firefox ]; then
     ln -snf /opt/lunar/firefox/firefox /usr/bin/firefox
-  fi
-
-# Not sure how to handle this, so I've left it commented out. Lunar Firefox devs can
-# probably fix this better than I can.
-  # Now the .desktop file and the icon
-# mkdir -p /usr/share/applications /usr/share/pixmaps  &&
-# install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications  &&
-  # please, dont just let the lin fail because /usr/share/pixmaps/firefox.xpm is an existing symlink...
-# rm -f /usr/share/pixmaps/firefox.xpm  &&
-# install -m644 $MOZILLA_HOME/icons/mozicon50.xpm /usr/share/pixmaps/firefox.xpm  &&
-
-  # Make firefox use its own icon
-
-# rm -rf /usr/lib/firefox-$VERSION/chrome/icons  &&
-# mkdir -p /usr/lib/firefox-$VERSION/chrome/icons/default  &&
+  fi &&
 
-# for icon in 16 32 48; do
-#   ln -sf /usr/lib/firefox-$VERSION/icons/mozicon128.png \
-#          /usr/lib/firefox-$VERSION/chrome/icons/default/default$icon.png
-# done
+ # Now the .desktop file and the icon
+ mkdir -p /usr/share/applications /usr/share/pixmaps  &&
+ install -m644 $SCRIPT_DIRECTORY/firefox-bin.desktop /usr/share/applications
 
 ) > $C_FIFO 2>&1
diff --git a/web/firefox-bin/firefox.desktop b/web/firefox-bin/firefox.desktop
deleted file mode 100644
index f8733ea..0000000
--- a/web/firefox-bin/firefox.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox
-Comment=Firefox Web Browser
-Exec=firefox
-Icon=/usr/share/pixmaps/firefox.xpm
-Terminal=false
-Type=Application
-Categories=Application;Network;
-Comment[pl]=Firefox - przeglÄ…darka WWW
-X-KDE-StartupNotify=true