Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Elisamuel Resto (8a443bf471617c392e756d76684cb938f2185931)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Elisamuel Resto (8a443bf471617c392e756d76684cb938f2185931)
  • Date: Thu, 19 Jun 2008 02:25:19 -0500

GIT changes to master z-rejected grimoire by Elisamuel Resto
<ryuji AT sourcemage.org>:

z-http/flash/CONFIGURE | 21 ++---
z-http/flash/CONFLICTS | 2
z-http/flash/DEPENDS | 2
z-http/flash/HISTORY | 5 +
z-http/flash/INSTALL | 201
++++++++++++++++++++++++++++++-------------------
5 files changed, 145 insertions(+), 86 deletions(-)

New commits:
commit 8a443bf471617c392e756d76684cb938f2185931
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

z-http/flash: chained commands in INSTALL and CONFIGURE; added KDE4
support (Konqueror)

diff --git a/z-http/flash/CONFIGURE b/z-http/flash/CONFIGURE
index e62931f..93656f2 100755
--- a/z-http/flash/CONFIGURE
+++ b/z-http/flash/CONFIGURE
@@ -13,7 +13,7 @@ echo "Flash works with the following programs:" &&
echo "Mozilla" &&
echo "Firefox" &&
echo "Seamonkey" &&
-echo "Konqueror" &&
+echo "Konqueror (KDE 3.x/4.x)" &&
echo "Opera" &&
echo "Netscape (not version 4.x)" &&
echo "XULRunner" &&
@@ -23,13 +23,14 @@ 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 seamonkey Seamonkey SEAMONKEY
-ask_spell firefox-bin Firefox-bin FIRE_BIN
-ask_spell kdebase Konqueror KDEBASE
-ask_spell opera Opera OPERA
-ask_spell netscape4 Netscape NETSCAPE
-ask_spell xulrunner XULRunner XULRUNNER
-ask_spell icecat Icecat ICECAT
+ask_spell mozilla Mozilla MOZILLA &&
+ask_spell firefox Firefox 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/CONFLICTS b/z-http/flash/CONFLICTS
index 9f83ec7..e6040c4 100755
--- a/z-http/flash/CONFLICTS
+++ b/z-http/flash/CONFLICTS
@@ -1 +1 @@
-conflicts swift-flash
+conflicts swift-flash
diff --git a/z-http/flash/DEPENDS b/z-http/flash/DEPENDS
index 18468b8..e9e8568 100755
--- a/z-http/flash/DEPENDS
+++ b/z-http/flash/DEPENDS
@@ -1 +1 @@
-depends NS-PLUGIN-COMPATIBLE
+depends NS-PLUGIN-COMPATIBLE
diff --git a/z-http/flash/HISTORY b/z-http/flash/HISTORY
index 4350cbf..1f058c4 100644
--- a/z-http/flash/HISTORY
+++ b/z-http/flash/HISTORY
@@ -1,3 +1,8 @@
+2008-06-19 Elisameul Resto <ryuji AT sourcemage.org>
+ * CONFLICTS, DEPENDS: double-spaces removed
+ * INSTALL: chained all the code; readability; added support for KDE4
+ * CONFIGURE: chained all the code; added support for KDE4
+
2008-06-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated beta to astro - 051508

diff --git a/z-http/flash/INSTALL b/z-http/flash/INSTALL
index dde1b39..3535af4 100755
--- a/z-http/flash/INSTALL
+++ b/z-http/flash/INSTALL
@@ -1,64 +1,77 @@
case $MOZILLA in
y|Y)
- if [ -d /usr/lib/mozilla/plugins ]; then
- message "${MESSAGE_COLOR}Installing for
Mozilla${DEFAULT_COLOR}\n"
- if [ -e /usr/lib/mozilla/plugins/libflashplayer.so ];
then
+ if [[ -d /usr/lib/mozilla/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
Mozilla${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /usr/lib/mozilla/plugins/libflashplayer.so
]]; then
rm -f
/usr/lib/mozilla/plugins/libflashplayer.so
- fi
- if [ -e /usr/lib/mozilla/plugins/flashplayer.xpt ];
then
+ fi &&
+
+ if [[ -e /usr/lib/mozilla/plugins/flashplayer.xpt ]];
then
rm -f /usr/lib/mozilla/plugins/flashplayer.xpt
- fi
+ fi &&
+
cp libflashplayer.so /usr/lib/mozilla/plugins/
fi
;;
esac &&

case $FIREFOX in
- y|Y)
- FIREFOX_VERSION=$(installed_version firefox)
- if [ "$FIREFOX_VERSION" == "cvs" ]; then
+ 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 [ -e $FIREFOX_DIR/plugins/libflashplayer.so ]; then
+ fi &&
+
+ if [[ -d $FIREFOX_DIR/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
firefox${DEFAULT_COLOR}\n" &&
+
+ if [[ -e $FIREFOX_DIR/plugins/libflashplayer.so ]];
then
rm -f $FIREFOX_DIR/plugins/libflashplayer.so
- fi
- if [ -e $FIREFOX_DIR/plugins/flashplayer.xpt ]; then
- rm -f $FIREFOX_DIR/plugins/flashplayer.xpt
- fi
- cp libflashplayer.so $FIREFOX_DIR/plugins/
+ fi &&
+
+ if [[ -e $FIREFOX_DIR/plugins/flashplayer.xpt ]]; then
+ rm -f $FIREFOX_DIR/plugins/flashplayer.xpt
+ fi &&
+
+ cp libflashplayer.so $FIREFOX_DIR/plugins/
fi
;;
esac &&

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

case $FIRE_BIN in
- y|Y)
- if [ -d /opt/firefox/plugins ]; then
- message "${MESSAGE_COLOR}Installing for
Firefox-bin${DEFAULT_COLOR}\n"
- if [ -e /opt/firefox/plugins/libflashplayer.so ]; then
+ y|Y)
+ if [[ -d /opt/firefox/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
Firefox-bin${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /opt/firefox/plugins/libflashplayer.so ]];
then
rm -f /opt/firefox/plugins/libflashplayer.so
- fi
- if [ -e /opt/firefox/plugins/flashplayer.xpt ]; then
+ fi &&
+
+ if [[ -e /opt/firefox/plugins/flashplayer.xpt ]]; then
rm -f /opt/firefox/plugins/flashplayer.xpt
- fi
+ fi &&
+
cp libflashplayer.so /opt/firefox/plugins/
fi
;;
@@ -66,34 +79,63 @@ esac &&

case $KDEBASE in
y|Y)
- message "${MESSAGE_COLOR}Installing for
Konqueror${DEFAULT_COLOR}\n"
- message "${MESSAGE_COLOR}" \
- "After install, add
/usr/lib/konqueror to the Plugins folders\n" \
- "list and click on the \"Scan
for New Plugins\" button${DEFAULT_COLOR}\n"
- if [ -e /usr/lib/konqueror/libflashplayer.so ]; then
+ message "${MESSAGE_COLOR}Installing for Konqueror
(KDE3)${DEFAULT_COLOR}\n"
+ message "${MESSAGE_COLOR}\n" \
+ "After install, add /usr/lib/konqueror to the
Plugins folders\n" \
+ "list and click on the \"Scan for New
Plugins\" button${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /usr/lib/konqueror/libflashplayer.so ]]; then
rm -f /usr/lib/konqueror/libflashplayer.so
- fi
- if [ -e /usr/lib/konqueror/flashplayer.xpt ]; then
+ fi &&
+
+ if [[ -e /usr/lib/konqueror/flashplayer.xpt ]]; then
rm -f /usr/lib/konqueror/flashplayer.xpt
- fi
- if ! [ -d /usr/lib/konqueror ]; then
+ fi &&
+
+ if ! [[ -d /usr/lib/konqueror ]]; then
mkdir --mode=755 /usr/lib/konqueror
- fi
+ fi &&
+
cp libflashplayer.so /usr/lib/konqueror/
;;
esac &&

+case $KDEBASE4 in
+ y|Y)
+ message "${MESSAGE_COLOR}Installing for Konqueror
(KDE4)${DEFAULT_COLOR}\n"
+ message "${MESSAGE_COLOR}" \
+ "After install, add /usr/lib/konqueror to the
Plugins folders\n" \
+ "list and click on the \"Scan for New
Plugins\" button${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /usr/lib/konqueror/libflashplayer.so ]]; then
+ rm -f /usr/lib/konqueror/libflashplayer.so
+ fi &&
+
+ if [[ -e /usr/lib/konqueror/flashplayer.xpt ]]; then
+ rm -f /usr/lib/konqueror/flashplayer.xpt
+ fi &&
+
+ if ! [[ -d /usr/lib/konqueror ]]; then
+ mkdir --mode=755 /usr/lib/konqueror
+ fi &&
+
+ cp libflashplayer.so /usr/lib/konqueror/
+ ;;
+esac &&

case $OPERA in
y|Y)
- if [ -d /usr/lib/opera/plugins ]; then
- message "${MESSAGE_COLOR}Installing for
Opera${DEFAULT_COLOR}\n"
- if [ -e /usr/lib/opera/plugins/libflashplayer.so ];
then
+ if [[ -d /usr/lib/opera/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
Opera${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /usr/lib/opera/plugins/libflashplayer.so ]];
then
rm -f /usr/lib/opera/plugins/libflashplayer.so
- fi
- if [ -e /usr/lib/opera/plugins/flashplayer.xpt ]; then
+ fi &&
+
+ if [[ -e /usr/lib/opera/plugins/flashplayer.xpt ]];
then
rm -f /usr/lib/opera/plugins/flashplayer.xpt
- fi
+ fi &&
+
cp libflashplayer.so /usr/lib/opera/plugins/
fi
;;
@@ -102,14 +144,17 @@ esac &&

case $NETSCAPE in
y|Y)
- if [ -d /usr/lib/netscape4/plugins ]; then
- message "${MESSAGE_COLOR}Installing for
Netscape${DEFAULT_COLOR}\n"
- if [ -e /usr/lib/netscape4/plugins/libflashplayer.so
]; then
+ if [[ -d /usr/lib/netscape4/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
Netscape${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /usr/lib/netscape4/plugins/libflashplayer.so
]]; then
rm -f
/usr/lib/netscape4/plugins/libflashplayer.so
- fi
- if [ -e /usr/lib/netscape4/plugins/flashplayer.xpt ];
then
+ fi &&
+
+ if [[ -e /usr/lib/netscape4/plugins/flashplayer.xpt
]]; then
rm -f
/usr/lib/netscape4/plugins/flashplayer.xpt
- fi
+ fi &&
+
cp libflashplayer.so /usr/lib/netscape4/plugins/
fi
;;
@@ -117,44 +162,52 @@ 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
+ 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
+ fi &&
+ if [[ -e /usr/lib/xulrunner/plugins/flashplayer.xpt
]]; then
rm -f
/usr/lib/xulrunner/plugins/flashplayer.xpt
- fi
+ fi &&
+
cp libflashplayer.so /usr/lib/xulrunner/plugins/
fi
;;
esac &&

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

case $ICE_BIN in
- y|Y)
- if [ -d /opt/icecat/plugins ]; then
- message "${MESSAGE_COLOR}Installing for
Icecat-bin${DEFAULT_COLOR}\n"
- if [ -e /opt/icecat/plugins/libflashplayer.so ]; then
+ y|Y)
+ if [[ -d /opt/icecat/plugins ]]; then
+ message "${MESSAGE_COLOR}Installing for
Icecat-bin${DEFAULT_COLOR}\n" &&
+
+ if [[ -e /opt/icecat/plugins/libflashplayer.so ]];
then
rm -f /opt/icecat/plugins/libflashplayer.so
- fi
- if [ -e /opt/icecat/plugins/flashplayer.xpt ]; then
+ fi &&
+
+ if [[ -e /opt/icecat/plugins/flashplayer.xpt ]]; then
rm -f /opt/icecat/plugins/flashplayer.xpt
- fi
+ fi &&
+
cp libflashplayer.so /opt/icecat/plugins/
fi
;;



  • [SM-Commit] GIT changes to master z-rejected grimoire by Elisamuel Resto (8a443bf471617c392e756d76684cb938f2185931), Elisamuel Resto, 06/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page