OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 15-Jul-2003 10:48:09
Branch: HEAD Handle: 2003071509480602
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc
openpkg-web news.txt
Log:
add to 'rc' the -v/--verbose option again and provide
terminal-detection
Summary:
Revision Changes Path
1.13 +1 -0 openpkg-src/openpkg/HISTORY
1.174 +1 -1 openpkg-src/openpkg/openpkg.spec
1.35 +16 -0 openpkg-src/openpkg/rc
1.5566 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.12 -r1.13 HISTORY
--- openpkg-src/openpkg/HISTORY 14 Jul 2003 12:52:54 -0000 1.12
+++ openpkg-src/openpkg/HISTORY 15 Jul 2003 08:48:08 -0000 1.13
@@ -2,6 +2,7 @@
2003
====
+20030715 add to "rc" the -v/--verbose option again and provide terminal-detection
20030714 reduce run-time of "rc" --eval/--print operations by parsing %config
sections just once
20030714 add convinience macros %l_rc and %l_rpm; resolve conflict with openpkg-rc
package
20030714 bugfix verbose output; add "rc" command to search path for run-command
sections
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.173 -r1.174 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 14 Jul 2003 08:25:34 -0000 1.173
+++ openpkg-src/openpkg/openpkg.spec 15 Jul 2003 08:48:08 -0000 1.174
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030714
+%define V_openpkg 20030715
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.34 -r1.35 rc
--- openpkg-src/openpkg/rc 14 Jul 2003 14:23:16 -0000 1.34
+++ openpkg-src/openpkg/rc 15 Jul 2003 08:48:08 -0000 1.35
@@ -45,6 +45,7 @@
# default parameters
silent=0
+verbose=0
debug=0
help=0
print=0
@@ -63,6 +64,7 @@
esac
case $opt in
-s|--silent ) silent=1 ;;
+ -v|--verbose ) verbose=1 ;;
-d|--debug ) debug=1 ;;
-h|--help ) help="Usage" ;;
-p|--print ) print=1 ;;
@@ -76,6 +78,20 @@
esac
shift
done
+
+# determine a reasonable default silent/verbose situation in case
+# nothing was explicitly specified or a conflicting situation was
+# specified. Else is silent set either disabled by default (0) or
+# was explicitly enabled (1).
+if [ $silent -eq $verbose ]; then
+ if [ -t 1 ]; then
+ # stdout connected to a terminal device
+ silent=0
+ else
+ # stdout NOT connected to a terminal device
+ silent=1
+ fi
+fi
# determine path to rc.conf
rcconf="`echo $rcdir | sed -e 's;/rc.d$;/rc.conf;'`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5565 -r1.5566 news.txt
--- openpkg-web/news.txt 15 Jul 2003 08:13:32 -0000 1.5565
+++ openpkg-web/news.txt 15 Jul 2003 08:48:06 -0000 1.5566
@@ -1,3 +1,4 @@
+15-Jul-2003: Upgraded package: P<openpkg-20030715-20030715>
15-Jul-2003: Upgraded package: P<tiff-3.5.7-20030715>
15-Jul-2003: Upgraded package: P<socat-1.3.2.1-20030715>
15-Jul-2003: Upgraded package: P<rt-3.0.4-20030715>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
