Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (905ec97b9a36bb60dbe0332ea5cbae582b03826e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (905ec97b9a36bb60dbe0332ea5cbae582b03826e)
  • Date: Wed, 8 Oct 2008 19:58:34 -0500

GIT changes to master z-rejected grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

z-http/flash/CONFIGURE | 6 ++----
z-http/flash/HISTORY | 4 ++++
z-http/flash/INSTALL | 39 +++++++--------------------------------
3 files changed, 13 insertions(+), 36 deletions(-)

New commits:
commit 905ec97b9a36bb60dbe0332ea5cbae582b03826e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

flash: Only install once for firefox and xulrunner

diff --git a/z-http/flash/CONFIGURE b/z-http/flash/CONFIGURE
index 93656f2..109c64f 100755
--- a/z-http/flash/CONFIGURE
+++ b/z-http/flash/CONFIGURE
@@ -11,12 +11,11 @@ source $GRIMOIRE/REJECTED_MSG &&

echo "Flash works with the following programs:" &&
echo "Mozilla" &&
-echo "Firefox" &&
+echo "Firefox/XULRunner" &&
echo "Seamonkey" &&
echo "Konqueror (KDE 3.x/4.x)" &&
echo "Opera" &&
echo "Netscape (not version 4.x)" &&
-echo "XULRunner" &&
echo "Icecat" &&

echo "Select which currently installed applications you wish to install
Flash for." &&
@@ -24,13 +23,12 @@ echo "Select which currently installed applications you
wish to install Flash fo
persistent_add MOZILLA FIREFOX SEAMONKEY FIRE_BIN KDEBASE OPERA NETSCAPE
XULRUNNER ICE_BIN ICECAT &&

ask_spell mozilla Mozilla MOZILLA &&
-ask_spell firefox Firefox FIREFOX &&
+ask_spell xulrunner "Firefox/XULRunner" FIREFOX &&
ask_spell seamonkey Seamonkey SEAMONKEY &&
ask_spell firefox-bin Firefox-bin FIRE_BIN &&
ask_spell kdebase "Konqueror (KDE3)" KDEBASE &&
ask_spell kdebase4 "Konqueror (KDE4)" KDEBASE4 &&
ask_spell opera Opera OPERA &&
ask_spell netscape4 Netscape NETSCAPE &&
-ask_spell xulrunner XULRunner XULRUNNER &&
ask_spell icecat Icecat ICECAT &&
ask_spell icecat-bin Icecat-bin ICE_BIN
diff --git a/z-http/flash/HISTORY b/z-http/flash/HISTORY
index caa8424..05575fe 100644
--- a/z-http/flash/HISTORY
+++ b/z-http/flash/HISTORY
@@ -1,3 +1,7 @@
+2008-10-08 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Combine firefox and xulrunner
+ * INSTALL: Combine firefox and xulrunner
+
2008-08-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated FLASH_BETA=y to 081108

diff --git a/z-http/flash/INSTALL b/z-http/flash/INSTALL
index 3535af4..3b4f21c 100755
--- a/z-http/flash/INSTALL
+++ b/z-http/flash/INSTALL
@@ -18,25 +18,17 @@ esac &&

case $FIREFOX in
y|Y)
- FIREFOX_VERSION=$(installed_version firefox) &&
- if [[ "$FIREFOX_VERSION" == "cvs" ]]; then
- FIREFOX_DIR="/usr/lib/firefox-0.8.0+"
- else
- FIREFOX_DIR="/usr/lib/firefox"
- fi &&
-
- if [[ -d $FIREFOX_DIR/plugins ]]; then
- message "${MESSAGE_COLOR}Installing for
firefox${DEFAULT_COLOR}\n" &&
+ if [[ -d /usr/lib/xulrunner/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
Firefox/XULRunner${DEFAULT_COLOR}\n" &&

- if [[ -e $FIREFOX_DIR/plugins/libflashplayer.so ]];
then
- rm -f $FIREFOX_DIR/plugins/libflashplayer.so
+ if [[ -e /usr/lib/xulrunner/plugins/libflashplayer.so
]]; then
+ rm -f
/usr/lib/xulrunner/plugins/libflashplayer.so
fi &&
-
- if [[ -e $FIREFOX_DIR/plugins/flashplayer.xpt ]]; then
- rm -f $FIREFOX_DIR/plugins/flashplayer.xpt
+ if [[ -e /usr/lib/xulrunner/plugins/flashplayer.xpt
]]; then
+ rm -f
/usr/lib/xulrunner/plugins/flashplayer.xpt
fi &&

- cp libflashplayer.so $FIREFOX_DIR/plugins/
+ cp libflashplayer.so /usr/lib/xulrunner/plugins/
fi
;;
esac &&
@@ -160,23 +152,6 @@ case $NETSCAPE in
;;
esac &&

-case $XULRUNNER in
- y|Y)
- if [[ -d /usr/lib/xulrunner/plugins ]]; then
- message "${MESSAGE_COLOR}Installing for
XULRunner${DEFAULT_COLOR}\n" &&
-
- if [[ -e /usr/lib/xulrunner/plugins/libflashplayer.so
]]; then
- rm -f
/usr/lib/xulrunner/plugins/libflashplayer.so
- fi &&
- if [[ -e /usr/lib/xulrunner/plugins/flashplayer.xpt
]]; then
- rm -f
/usr/lib/xulrunner/plugins/flashplayer.xpt
- fi &&
-
- cp libflashplayer.so /usr/lib/xulrunner/plugins/
- fi
- ;;
-esac &&
-
case $ICECAT in
y|Y)
if [[ -d /usr/lib/icecat/plugins ]]; then



  • [SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (905ec97b9a36bb60dbe0332ea5cbae582b03826e), George Sherwood, 10/08/2008

Archive powered by MHonArc 2.6.24.

Top of Page