diff options
Diffstat (limited to 'scripts/cvs2dist')
| -rwxr-xr-x | scripts/cvs2dist | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/cvs2dist b/scripts/cvs2dist index c1c8e138..60721bdf 100755 --- a/scripts/cvs2dist +++ b/scripts/cvs2dist @@ -8,7 +8,7 @@ # Original author (of cvs2pack.sh) was Sebastian Stein <seb.stein@hpfsc.de> # Heavy, heavy modifications by Jason Katz-Brown <jason@katzbrown.com> # Some modifications for i18n inclusion by Dominique Devriese <devriese@kde.org> -# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de> +# Added --no-i18n-lang and --replace-files by Michael Buesch <mbuesch@freenet.de> # License: GPL (http://www.gnu.org/) # Last modification: 2004/10/13 @@ -39,7 +39,7 @@ test -e ~/.cvs2distrc && extraoptions=`cat ~/.cvs2distrc` # --log has optional argument TEMP=`getopt \ -o v:n:r:e:a:B:dhmbgol \ ---long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,cvs-root:,debug,tqreplace-files: \ +--long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,cvs-root:,debug,replace-files: \ -n cvs2dist -- $extraoptions "$@"` if [ $? != 0 ]; then @@ -97,7 +97,7 @@ while true; do shift 2 ;; esac ;; - --tqreplace-files) replace_files="$2"; shift 2 ;; + --replace-files) replace_files="$2"; shift 2 ;; --) shift break ;; *) echo "Aborted." @@ -152,11 +152,11 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then echo " -e --required-header-error-message <message>" echo " Error message for above." echo " -d --remove-hidden Remove hidden files/directories from packages" - echo " --tqreplace-files <file-pair-list>" + echo " --replace-files <file-pair-list>" echo " <file-pair-list> is a comma separated list of file pairs" echo " which should be replaced in the final distribution package." echo " Each element of a pair is separated by an @" - echo -n " Example: --tqreplace-files take_this_file@and_move_it_here," + echo -n " Example: --replace-files take_this_file@and_move_it_here," echo "configure.in.bot.dist@configure.in.bot" echo " The filenames are all relative to your package root." echo " Please be careful! Try to avoid the usage of .. in the path. It" @@ -349,7 +349,7 @@ fi if [ -d $module/doc/$name ]; then mkdir -p $temp_dist/doc/$name cp -Rf $module/doc/$name $temp_dist/doc - tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} cp {} $temp_dist/doc + find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc if [ $doi18n = "yes" ]; then pushd $temp_dir @@ -435,7 +435,7 @@ fi # and all files from the base dir, except directories echo "Copying over files from the module directory:" >> $log -tqfind $module ! -xtype d -maxdepth 1 | xargs --verbose --tqreplace={} cp {} $temp_dist 2>> $log +find $module ! -xtype d -maxdepth 1 | xargs --verbose --replace={} cp {} $temp_dist 2>> $log echo "--------" >> $log # we now enter the temp_dist and delete all unwanted files @@ -479,7 +479,7 @@ if [ -n "$replace_files" ]; then echo "$from_path does not exist!" >> $log echo "" echo "Warning: \"$from\" does not exist!" - echo -n "Please enter the path in --tqreplace-files relative " + echo -n "Please enter the path in --replace-files relative " echo "to the package root of your project." echo "Your package root is: \"$module/$directory\"" echo "" @@ -516,8 +516,8 @@ cd $temp_dist # remove files echo "Remove files: " >> $log for file in $remove; do - tqfind . -name $file | xargs rm -Rf - echo "tqfind . -name $file | xargs rm -Rf" >> $log + find . -name $file | xargs rm -Rf + echo "find . -name $file | xargs rm -Rf" >> $log done # remove more files @@ -528,7 +528,7 @@ done unset file # remove hidden files -test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log +test ! -z $removehidden && echo "Remove hidden files: " >> $log && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log echo "--------" >> $log |