diff --git a/build/patch/buildpatch.ksh b/build/patch/buildpatch.sh old mode 100644 new mode 100755 similarity index 50% rename from build/patch/buildpatch.ksh rename to build/patch/buildpatch.sh index e19c85be23f..646d7b2fd49 --- a/build/patch/buildpatch.ksh +++ b/build/patch/buildpatch.sh @@ -1,9 +1,9 @@ #/bin/ksh #---------------------------------------------------------------------------- -# \file build/patch/buildpatch.ksh +# \file build/patch/buildpatch.sh # \brief Create patch files # \version $Revision$ -# \author (c)2009 Laurent Destailleur +# \author (c)2009-2011 Laurent Destailleur #---------------------------------------------------------------------------- # This script can be used to build a patch after a developer has made # changes on files in its Dolibarr tree. @@ -11,13 +11,12 @@ # with explanation on its goal, for inclusion in main branch. #---------------------------------------------------------------------------- -# Put here full path of original and new dolibarr directories -# Example: olddir=/mydirA1/mydirA2/dolibarrold -# Example: newdir=/mydirB1/mydirB2/dolibarr -export olddir=original_dir -export newdir=modified_dir - echo ----- Building patch file mypatch.patch ----- -echo Build patch between \"$olddir\" and \"$newdir\" -diff -BNaur --exclude=CVS --exclude="*.patch" --exclude=".#*" --exclude="*~" --exclude="*.rej" --exclude="*.orig" --exclude="*.bak" --exclude=conf.php --exclude=documents $olddir $newdir > mypatch.patch - +if [ -z "$1" ] || [ -z "$2" ]; +then + echo Usage: buildpatch.sh original_dir_path modified_dir_path + echo Example: buildpatch.sh /mydirA/dolibarrold /mydirB/dolibarrnew +else + echo Build patch between \"$1\" and \"$2\" + diff -BNaur --exclude=CVS --exclude="*.patch" --exclude=".#*" --exclude="*~" --exclude="*.rej" --exclude="*.orig" --exclude="*.bak" --exclude=conf.php --exclude=documents $1 $2 > mypatch.patch +fi