[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Fri Jun 12 16:30:54 UTC 2020


The branch, master has been updated
       via  d3ae752c Fix running prepare-source from a separate build dir.
      from  e3437244 Improve how the help lines are harvested from the md file.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d3ae752c534f741be7f3d0493df6c62198199517
Author: Wayne Davison <wayne at opencoder.net>
Date:   Fri Jun 12 09:29:30 2020 -0700

    Fix running prepare-source from a separate build dir.

-----------------------------------------------------------------------

Summary of changes:
 prepare-source | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/prepare-source b/prepare-source
index e4232408..3e4f9edf 100755
--- a/prepare-source
+++ b/prepare-source
@@ -12,8 +12,8 @@
 # The script stops after the first successful action.
 
 dir=`dirname $0`
-if test x"$dir" != x -a x"$dir" != x.; then
-    cd "$dir"
+if test x"$dir" = x; then
+    dir=.
 fi
 
 if test $# = 0; then
@@ -23,21 +23,20 @@ fi
 for action in "${@}"; do
     case "$action" in
     build|make)
-	make -f prepare-source.mak
+	(cd $dir && make -f prepare-source.mak)
 	;;
     fetch)
-	if perl --version >/dev/null 2>/dev/null; then
-	    files='[ca]*'
-	else
-	    files='[cap]*'
+	$dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir
+	if ! perl --version >/dev/null 2>/dev/null; then
+	    $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'p*' .
 	fi
-	./rsync-ssl -ip rsync://download.samba.org/rsyncftp/generated-files/"$files" .
 	;;
     fetchgen)
-	./rsync-ssl -ip rsync://download.samba.org/rsyncftp/generated-files/'*' .
+	$dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir
+	$dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' .
 	;;
     fetchSRC)
-	./rsync-ssl -ipr --exclude=/.git/ rsync://download.samba.org/ftp/pub/unpacked/rsync/ .
+	./rsync-ssl -iipr --no-motd --exclude=/.git/ rsync://download.samba.org/ftp/pub/unpacked/rsync/ .
 	;;
     *)
 	echo "Unknown action: $action"


-- 
The rsync repository.



More information about the rsync-cvs mailing list