[CVS] RPM: rpm/scripts/ gendiff

2011-10-06 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   06-Oct-2011 20:19:45
  Branch: HEAD Handle: 2011100618194500

  Modified files:
rpm/scripts gendiff

  Log:
use bash shell as interpreter due to bashism

  Summary:
RevisionChanges Path
1.7 +1  -1  rpm/scripts/gendiff
  

  patch -p0 '@@ .'
  Index: rpm/scripts/gendiff
  
  $ cvs diff -u -r1.6 -r1.7 gendiff
  --- rpm/scripts/gendiff   21 Oct 2009 16:25:59 -  1.6
  +++ rpm/scripts/gendiff   6 Oct 2011 18:19:45 -   1.7
  @@ -1,4 +1,4 @@
  -#!/bin/sh
  +#!/bin/bash
   
   usage () {
 echo usage: $0 directory diff-extension 12
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/scripts/ gendiff

2009-10-21 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   21-Oct-2009 18:26:00
  Branch: HEAD Handle: 2009102116255900

  Modified files:
rpm/scripts gendiff

  Log:
drop gendiff checkbashisms complaint; use unipolar branches for
readability

  Summary:
RevisionChanges Path
1.6 +8  -8  rpm/scripts/gendiff
  

  patch -p0 '@@ .'
  Index: rpm/scripts/gendiff
  
  $ cvs diff -u -r1.5 -r1.6 gendiff
  --- rpm/scripts/gendiff   25 Mar 2008 01:51:29 -  1.5
  +++ rpm/scripts/gendiff   21 Oct 2009 16:25:59 -  1.6
  @@ -1,22 +1,22 @@
   #!/bin/sh
   
  -function usage () {
  +usage () {
 echo usage: $0 directory diff-extension 12
 exit 1
   }
   
   : ${DIFF:=diff -p}
   
  -if [ $1 = -p -a -z $3 ];then
  +[ $1 = -p -a -z $3 ]  {
echo With -p you need to give the definition of patch (like dummy)
exit 1
  -fi
  +}
   
  -if [ $1 = -p ];then
  +[ $1 = -p ]  {
   DEFAULT_PATCH=$2
   shift;
  - shift;
  -fi
  +shift;
  +}
   
   [ -z $1 ]  usage
   
  @@ -25,10 +25,10 @@
 exit 1
   }
   
  -if [ -n $DEFAULT_PATCH -a $RPM ];then
  +[ -n $DEFAULT_PATCH -a $RPM ]  {
   FILEPATCH=$RPM/SOURCES/$(echo $1|sed 's@/@@g')-$DEFAULT_PATCH.patch
   [ -f $FILEPATCH ]  mv -f $FILEPATCH $FILEPATCH.old
  -fi
  +}
   
   [ -n $2 ]  PATCH_PREFIX=$2
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/scripts/ gendiff

2008-03-24 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   25-Mar-2008 02:51:29
  Branch: HEAD Handle: 2008032501512900

  Modified files:
rpm/scripts gendiff

  Log:
add missing trailing | (noticed by Michael Jennings)

  Summary:
RevisionChanges Path
1.5 +1  -1  rpm/scripts/gendiff
  

  patch -p0 '@@ .'
  Index: rpm/scripts/gendiff
  
  $ cvs diff -u -r1.4 -r1.5 gendiff
  --- rpm/scripts/gendiff   24 Mar 2008 00:47:09 -  1.4
  +++ rpm/scripts/gendiff   25 Mar 2008 01:51:29 -  1.5
  @@ -32,7 +32,7 @@
   
   [ -n $2 ]  PATCH_PREFIX=$2
   
  -find $1 \( -name *$PATCH_PREFIX -o -name .*$PATCH_PREFIX \) -print | sort
  +find $1 \( -name *$PATCH_PREFIX -o -name .*$PATCH_PREFIX \) -print | 
sort |
   while read f; do
   U=-u
   [ `basename $f` = ChangeLog$2 ]  U=-U0
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/scripts/ gendiff

2008-03-23 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   24-Mar-2008 01:47:09
  Branch: HEAD Handle: 2008032400470900

  Modified files:
rpm/scripts gendiff

  Log:
rpm.org: make gendiff sort the file list, so comparing the results is
easier.

  Summary:
RevisionChanges Path
1.4 +1  -1  rpm/scripts/gendiff
  

  patch -p0 '@@ .'
  Index: rpm/scripts/gendiff
  
  $ cvs diff -u -r1.3 -r1.4 gendiff
  --- rpm/scripts/gendiff   20 Feb 2008 20:38:28 -  1.3
  +++ rpm/scripts/gendiff   24 Mar 2008 00:47:09 -  1.4
  @@ -32,7 +32,7 @@
   
   [ -n $2 ]  PATCH_PREFIX=$2
   
  -find $1 \( -name *$PATCH_PREFIX -o -name .*$PATCH_PREFIX \) -print |
  +find $1 \( -name *$PATCH_PREFIX -o -name .*$PATCH_PREFIX \) -print | sort
   while read f; do
   U=-u
   [ `basename $f` = ChangeLog$2 ]  U=-U0
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/scripts/ gendiff

2007-06-18 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   18-Jun-2007 18:31:34
  Branch: HEAD Handle: 2007061817313300

  Added files:
rpm/scripts gendiff

  Log:
add orphan file.

  Summary:
RevisionChanges Path
1.1 +21 -0  rpm/scripts/gendiff
  

  patch -p0 '@@ .'
  Index: rpm/scripts/gendiff
  
  $ cvs diff -u -r0 -r1.1 gendiff
  --- /dev/null 2007-06-18 18:22:01 +0200
  +++ gendiff   2007-06-18 18:31:34 +0200
  @@ -0,0 +1,21 @@
  +#!/bin/sh
  +
  +[ -z $1 -o -z $2 ]  {
  +# usage
  +  echo usage: $0 directory diff-extension 12
  +  exit 1
  +}
  +
  +: ${DIFF:=diff -p}
  +
  +find $1 \( -name *$2 -o -name .*$2 \) -print |
  +while read f; do
  +U=-u
  +[ `basename $f` = ChangeLog$2 ]  U=-U0
  +#${DIFF}  ${U} $f `echo $f | sed s/$2\$//`
  +if [ -r $f ]; then
  + ${DIFF}  ${U} ${f} ${f%$2}
  +else
  + ${DIFF}  ${U} /dev/null ${f%$2}
  +fi
  +done
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org