--- embedaddon/rsync/prepare-source 2016/11/01 09:54:32 1.1.1.2 +++ embedaddon/rsync/prepare-source 2021/03/17 00:32:36 1.1.1.3 @@ -5,17 +5,37 @@ # Specify one action or more than one to provide a fall-back: # # build build the config files [the default w/no arg] -# fetch fetch the latest dev config files -# fetchgen fetch all the latest dev generated files +# fetch fetch the latest dev autoconfig files +# fetchgen fetch all the latest dev generated files (including man pages) # fetchSRC fetch the latest dev source files [NON-GENERATED FILES] # # 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 "$dir" = '.'; then + branch=`packaging/prep-auto-dir` || exit 1 + if test x"$branch" != x; then + cd build || exit 1 + dir=.. + fi +fi + +if test "$dir" != '.'; then + for lnk in configure.ac m4; do + if test ! -h $lnk; then + rm -f $lnk # Just in case + ln -s "$dir/$lnk" $lnk + fi + done + for fn in configure.sh config.h.in aclocal.m4; do + test ! -f $fn -a -f "$dir/$fn" && cp -p "$dir/$fn" $fn + done +fi + if test $# = 0; then set -- build fi @@ -23,25 +43,26 @@ fi for action in "${@}"; do case "$action" in build|make) - make -f prepare-source.mak + make -f "$dir/prepare-source.mak" ;; - fetch) - if perl --version >/dev/null 2>/dev/null; then - files='[ca]*' + fetch|fetchgen) + if test "$action" = fetchgen; then + match='*' else - files='[cap]*' + match='[ca]*' fi - rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/"$files" . + $dir/rsync-ssl -iipc --no-motd "rsync://download.samba.org/rsyncftp/generated-files/$match" ./ + test $? != 0 && continue + sleep 1 # The following files need to be newer than aclocal.m4 + touch configure.sh config.h.in ;; - fetchgen) - rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/'*' . - ;; fetchSRC) - rsync -pvrz --exclude=/.git/ rsync://rsync.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" exit 1 + ;; esac if test $? = 0; then exit