Author: sparky Date: Sun Sep 10 11:59:50 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- start script uses exec now, and simplified a little
---- Files affected:
SPECS:
seamonkey.spec (1.40 -> 1.41)
---- Diffs:
================================================================
Index: SPECS/seamonkey.spec
diff -u SPECS/seamonkey.spec:1.40 SPECS/seamonkey.spec:1.41
--- SPECS/seamonkey.spec:1.40 Thu Aug 3 09:53:26 2006
+++ SPECS/seamonkey.spec Sun Sep 10 13:59:45 2006
@@ -380,44 +380,45 @@
LD_LIBRARY_PATH=%{_seamonkeydir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
-MOZILLA_FIVE_HOME=%{_seamonkeydir}
+MOZILLA_FIVE_HOME="%{_seamonkeydir}"
+SEAMONKEY="$MOZILLA_FIVE_HOME/seamonkey-bin"
if [ "$1" == "-remote" ]; then
- %{_seamonkeydir}/seamonkey-bin "$@"
-else
- PING=`%{_seamonkeydir}/seamonkey-bin -remote 'ping()' 2>&1 >/dev/null`
- if [ -n "$PING" ]; then
- if [ -f "`pwd`/$1" ]; then
- %{_seamonkeydir}/seamonkey-bin "file://`pwd`/$1"
- else
- %{_seamonkeydir}/seamonkey-bin "$@"
- fi
+ exec $SEAMONKEY "$@"
+fi
+
+PING=`$SEAMONKEY -remote 'ping()' 2>&1 >/dev/null`
+if [ -n "$PING" ]; then
+ if [ -f "`pwd`/$1" ]; then
+ exec $SEAMONKEY "file://`pwd`/$1"
else
- if [ -z "$1" ]; then
- %{_seamonkeydir}/seamonkey-bin -remote 'xfeDoCommand
(openBrowser)'
- elif [ "$1" == "-mail" ]; then
- %{_seamonkeydir}/seamonkey-bin -remote 'xfeDoCommand
(openInbox)'
- elif [ "$1" == "-compose" ]; then
- %{_seamonkeydir}/seamonkey-bin -remote 'xfeDoCommand
(composeMessage)'
- else
- echo $1 | grep -q "^-" > /dev/null
- if [ $? -eq 0 ]; then
- %{_seamonkeydir}/seamonkey-bin "$@"
- else
- if [ -f "`pwd`/$1" ]; then
- URL="file://`pwd`/$1"
- else
- URL="$1"
- fi
- grep browser.tabs.opentabfor.middleclick
~/.mozilla/default/*/prefs.js | grep true > /dev/null
- if [ $? -eq 0 ]; then
- %{_seamonkeydir}/seamonkey-bin -remote
"OpenUrl($URL,new-tab)"
- else
- %{_seamonkeydir}/seamonkey-bin -remote
"OpenUrl($URL,new-window)"
- fi
- fi
- fi
+ exec $SEAMONKEY "$@"
fi
fi
+
+if [ -z "$1" ]; then
+ exec $SEAMONKEY -remote 'xfeDoCommand (openBrowser)'
+elif [ "$1" == "-mail" ]; then
+ exec $SEAMONKEY -remote 'xfeDoCommand (openInbox)'
+elif [ "$1" == "-compose" ]; then
+ exec $SEAMONKEY -remote 'xfeDoCommand (composeMessage)'
+fi
+
+[[ $1 == -* ]] && exec $SEAMONKEY "$@"
+
+if [ -f "`pwd`/$1" ]; then
+ URL="file://`pwd`/$1"
+else
+ URL="$1"
+fi
+if grep -q -E 'browser.tabs.opentabfor.middleclick.*true' \
+ ~/.mozilla/default/*/prefs.js; then
+ exec $SEAMONKEY -remote "OpenUrl($URL,new-tab)"
+else
+ exec $SEAMONKEY -remote "OpenUrl($URL,new-window)"
+fi
+
+echo "Cannot execute SeaMonkey ($SEAMONKEY)!" >&2
+exit 1
EOF
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
@@ -855,6 +856,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2006/09/10 11:59:45 sparky
+- start script uses exec now, and simplified a little
+
Revision 1.40 2006/08/03 07:53:26 hawk
- updated to 1.0.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/seamonkey.spec?r1=1.40&r2=1.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
