From: Wayne Davison <wayne@opencoder.net>
Date: Fri, 12 Jun 2020 16:29:30 +0000 (-0700)
Subject: Fix running prepare-source from a separate build dir.
X-Git-Tag: v3.2.0pre1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3ae752c534f741be7f3d0493df6c62198199517;p=thirdparty%2Frsync.git

Fix running prepare-source from a separate build dir.
---

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"