OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Dec-2003 18:47:38
Branch: HEAD Handle: 2003122317473700
Modified files:
openpkg-src/mozilla mozilla.sh mozilla.spec
Log:
unconditionally include logic to handle -mail switch in shell wrapper
instead of conditionally including it
Summary:
Revision Changes Path
1.11 +16 -3 openpkg-src/mozilla/mozilla.sh
1.77 +1 -5 openpkg-src/mozilla/mozilla.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.sh
============================================================================
$ cvs diff -u -r1.10 -r1.11 mozilla.sh
--- openpkg-src/mozilla/mozilla.sh 7 Nov 2003 20:23:30 -0000 1.10
+++ openpkg-src/mozilla/mozilla.sh 23 Dec 2003 17:47:37 -0000 1.11
@@ -36,9 +36,10 @@
opt_r=""
while [ ".$1" != . ]; do
case $1 in
- -v|--verbose ) opt_v=yes; shift ;;
- -w|--window ) opt_w=yes; shift ;;
- -t|--tab ) opt_t=yes; shift ;;
+ -m|-mail|--mail ) opt_m=yes; shift ;;
+ -v|--verbose ) opt_v=yes; shift ;;
+ -w|--window ) opt_w=yes; shift ;;
+ -t|--tab ) opt_t=yes; shift ;;
-r|-remote|--remote ) opt_r="$2"; shift; shift ;;
-* ) echo "$0:ERROR: invalid option \"$1\"" 1>&2; exit 1 ;;
* ) break ;;
@@ -64,6 +65,18 @@
if [ ".$opt_r" != . ]; then
verbose "exec: $mozilla_bin -remote \"$opt_r\""
exec $mozilla_bin -remote "$opt_r"
+fi
+
+# special case of direct email option
+if [ ".$opt_m" != . ]; then
+ $mozilla_bin -remote "ping()" >/dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ verbose "$mozilla_bin -remote \"xfeDoCommand(openInbox)\""
+ $mozilla_bin -remote "xfeDoCommand(openInbox)"
+ else
+ verbose "exec: $mozilla_bin -mail"
+ exec $mozilla_bin -mail
+ fi
fi
# determine Mozilla run-time status
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 mozilla.spec
--- openpkg-src/mozilla/mozilla.spec 23 Dec 2003 10:38:45 -0000 1.76
+++ openpkg-src/mozilla/mozilla.spec 23 Dec 2003 17:47:37 -0000 1.77
@@ -45,7 +45,6 @@
Source1: ftp://ftp.openpkg.org/sources/CPY/mozilla/mozilla-1.4-libart.tar.bz2
Source2: mozilla.sh
Source3: mozilla.pod
-Source4: mailnews.patch
Patch0: mozilla.patch
# build information
@@ -75,11 +74,8 @@
%setup -q -n mozilla
%setup -q -n mozilla -D -T -a 1
- # patch source distribution and OpenPKG wrapper
+ # patch source distribution
%patch -p0
-%if "%{with_mailnews}" == "yes"
- %{l_patch} <%{SOURCE mailnews.patch} %{SOURCE mozilla.sh}
-%endif
# strip down source distribution (save disk space)
find . -type d -name "CVS" -print | xargs rm -rf
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
