Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.200' '-r1.201' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/04/21 15:07:41	1.200
+++ ChangeLog	2004/05/08 19:09:58	1.201
@@ -11,6 +11,10 @@
 
  Changes between 2.0b2 and 2.0b3 (07-Apr-2004 to 21-Apr-2004):
 
+   *) Add option "-q" to "shtool subst" for suppressing a new warning on
+      substitution operation resulting in no content change.
+      [Ralf S. Engelschall]
+
    *) Port "sh.platform" to full POSIX 1003.1-2001 (SUSv3) compliance by
       replacing "head -1" with "sed -e 'q'" and "tail -1" with "sed -n -e '$p'".
       [Ralf S. Engelschall]
Index: ossp-pkg/shtool/README
RCS File: /v/ossp/cvs/ossp-pkg/shtool/README,v
rcsdiff -q -kk '-r1.103' '-r1.104' -u '/v/ossp/cvs/ossp-pkg/shtool/README,v' 2>/dev/null
--- README	2004/04/07 07:55:19	1.103
+++ README	2004/05/08 19:09:58	1.104
@@ -10,7 +10,7 @@
   http://www.gnu.org/software/shtool/
   ftp://ftp.gnu.org/gnu/shtool/
 
-  Version 2.0b2 (07-Apr-2004)
+  Version 2.0b3 (08-May-2004)
 
   The GNU shtool program is a compilation of small but very stable and
   portable shell scripts into a single shell tool. All ingredients
Index: ossp-pkg/shtool/VERSION
RCS File: /v/ossp/cvs/ossp-pkg/shtool/VERSION,v
rcsdiff -q -kk '-r1.78' '-r1.79' -u '/v/ossp/cvs/ossp-pkg/shtool/VERSION,v' 2>/dev/null
--- VERSION	2004/04/07 07:55:19	1.78
+++ VERSION	2004/05/08 19:09:58	1.79
@@ -2,5 +2,5 @@
   VERSION -- Version Information for GNU shtool (syntax: Text)
   [automatically generated and maintained by GNU shtool]
 
-  This is GNU shtool, Version 2.0b2 (07-Apr-2004)
+  This is GNU shtool, Version 2.0b3 (08-May-2004)
 
Index: ossp-pkg/shtool/sh.subst
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.subst,v
rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.subst,v' 2>/dev/null
--- sh.subst	2004/02/17 08:54:14	1.12
+++ sh.subst	2004/05/08 19:09:58	1.13
@@ -19,14 +19,15 @@
 ##
 
 str_tool="subst"
-str_usage="[-v|--verbose] [-t|--trace] [-n|--nop] [-s|--stealth] [-i|--interactive] [-b|--backup <ext>] [-e|--exec <cmd>] [-f|--file <cmd-file>] [<file>] [...]"
+str_usage="[-v|--verbose] [-t|--trace] [-n|--nop] [-q|--quiet] [-s|--stealth] [-i|--interactive] [-b|--backup <ext>] [-e|--exec <cmd>] [-f|--file <cmd-file>] [<file>] [...]"
 gen_tmpfile=yes
 arg_spec="0+"
-opt_spec="v.t.n.s.i.b:e+f:"
-opt_alias="v:verbose,t:trace,n:nop,s:stealth,i:interactive,b:backup,e:exec,f:file"
+opt_spec="v.t.n.q.s.i.b:e+f:"
+opt_alias="v:verbose,t:trace,n:nop,q:quiet,s:stealth,i:interactive,b:backup,e:exec,f:file"
 opt_v=no
 opt_t=no
 opt_n=no
+opt_q=no
 opt_s=no
 opt_i=no
 opt_b=""
@@ -142,6 +143,13 @@
             fi
         fi
 
+        #   optionally check whether any content change actually occurred 
+        if [ ".$opt_q" = .no ]; then
+            if cmp $file$orig $file >/dev/null 2>&1; then
+                echo "$msgprefix:Warning: substitution operation results in no content change" 1>&2
+            fi
+        fi
+
         #   optionally remove preserved original file
         if [ ".$opt_b" = . ]; then
             if [ ".$opt_t" = .yes ]; then
@@ -183,6 +191,7 @@
 [B<-v>|B<--verbose>]
 [B<-t>|B<--trace>]
 [B<-n>|B<--nop>]
+[B<-q>|B<--quiet>]
 [B<-s>|B<--stealth>]
 [B<-i>|B<--interactive>]
 [B<-b>|B<--backup> I<ext>]
@@ -214,6 +223,10 @@
 No operation mode. Actual execution of the essential shell commands
 which would be executed is suppressed.
 
+=item B<-q>, B<--quiet>
+
+Suppress warning on substitution operation resulting in no content change.
+
 =item B<-s>, B<--stealth>
 
 Stealth operation. Preserve timestamp on I<file>.
Index: ossp-pkg/shtool/shtool.spec
RCS File: /v/ossp/cvs/ossp-pkg/shtool/shtool.spec,v
rcsdiff -q -kk '-r1.21' '-r1.22' -u '/v/ossp/cvs/ossp-pkg/shtool/shtool.spec,v' 2>/dev/null
--- shtool.spec	2004/04/07 07:55:19	1.21
+++ shtool.spec	2004/05/08 19:09:58	1.22
@@ -30,7 +30,7 @@
 %define prefix /usr/local
 %endif
 
-%define ver 2.0b2
+%define ver 2.0b3
 %define rel 0
 
 Name:       shtool