diff --git a/mirror b/mirror index 2159951..0be86cd 100755 --- a/mirror +++ b/mirror @@ -40,6 +40,14 @@ ALIEN_DESTDIR="people/alien/" ALIEN_OPTIONS=() ALIEN_FILTER=() +# Mirror info for bonslack +BONSLACK_TYPE="rsync" +BONSLACK_MIRROR="bonslack.org" +BONSLACK_MODULE="bonslack/" +BONSLACK_DESTDIR="bonslack/" +BONSLACK_OPTIONS=() +BONSLACK_FILTER=('--exclude=/.status.html*' '--exclude=/.template' '--exclude=/HEADER.html' '--exclude=status.html*' '--exclude=etc/shadow') + # Mirror info for people/alien-current-iso CURRENTISO_TYPE="rsync" CURRENTISO_MIRROR="bear.alienbase.nl" @@ -114,7 +122,7 @@ SLACKTREE_FILTER=('--exclude=/*-iso' '--exclude=/slackware-pre*' '--exclude=/sla # Mirror info for Zenwalk ZENWALK_TYPE="rsync" -ZENWALK_MIRROR="download.zenwalk.org" +ZENWALK_MIRROR="ssh.zenwalk.org" ZENWALK_MODULE="zenwalk/" ZENWALK_DESTDIR="zenwalk/" ZENWALK_OPTIONS=() @@ -135,7 +143,14 @@ SLACKARCHIVE_TYPE="rsync" SLACKARCHIVE_LOCAL="slackware/" SLACKARCHIVE_DESTDIR="cumulative/" SLACKARCHIVE_OPTIONS=() -SLACKARCHIVE_FILTER=('--exclude=source/' '--include=/slackware-15.0' '--include=/slackware64-15.0' '--include=/slackware-current' '--include=/slackware64-current' '--exclude=/*') +SLACKARCHIVE_FILTER=('--exclude=source/' '--include=/slackware-1[5-9].*' '--include=/slackware-[2-9][0-9].*' '--include=/slackware64-1[5-9].*' '--include=/slackware64-[2-9][0-9].*' '--include=/slackware-current' '--include=/slackware64-current' '--exclude=/*') + +# Mirror info for SlackwareARM cumulative tree. +SLACKARMARCHIVE_TYPE="rsync" +SLACKARMARCHIVE_LOCAL="slackwarearm/" +SLACKARMARCHIVE_DESTDIR="cumulative/" +SLACKARMARCHIVE_OPTIONS=() +SLACKARMARCHIVE_FILTER=('--exclude=source/' '--include=/slackwareaarch64-*' '--exclude=/*') # # lftp example @@ -239,6 +254,7 @@ done # Other remotes. (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && RSYNC_LIST+=('ALIEN') + (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && RSYNC_LIST+=('BONSLACK') (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && RSYNC_LIST+=('CURRENTISO') (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && RSYNC_LIST+=('KTOWN') (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && RSYNC_LIST+=('LIVESLAK') @@ -251,7 +267,8 @@ done # Locals. (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ .* ]] && RSYNC_LIST+=('SLACKARCHIVE') - (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && RSYNC_LIST+=('MULTILIBARCHIVE') + (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ .* ]] && RSYNC_LIST+=('SLACKARMARCHIVE') + (( ${SYNC_ALL:-0} == 1 )) || [[ $(printf "%(%H)T") =~ .* ]] && RSYNC_LIST+=('MULTILIBARCHIVE') } (( ${#LFTP_LIST[@]} == 0 )) && { # Nothing to sync here currently. @@ -260,10 +277,10 @@ done # Mirror a new Slackware version. [[ -v NEW_SLACK_VERSION ]] && { - "$DEBUG" "DEBUG: Checking for new Slackware release at $(date)." >&2 + "${DEBUG:-:}" "DEBUG: Checking for new Slackware release at $(date)." >&2 #export NEW_SLACK_VERSION /opt/bin/mirror-new-slackware-release "$NEW_SLACK_VERSION" - "$DEBUG" "DEBUG: Finished checking for new release at $(date)." >&2 + "${DEBUG:-:}" "DEBUG: Finished checking for new release at $(date)." >&2 } # Exit now if there's nothing to sync. @@ -313,7 +330,7 @@ for RUN in $(seq -s' ' 1 "$MAX_RUNS"); do fi echo "INFO: Begining processing of '$VAR' (run $RUN) at $(printf "%(%c)T")." >&2 - "$DEBUG" "DEBUG: Command line: RSYNC_PASSWORD=\"XXX\" $RSYNC_COMMAND ${!RSYNC_OPTS} ${RSYNC_VERBOSE[*]} ${!OPTIONS} ${!FILTER} $SRC ${!DESTDIR}" >&2 + "${DEBUG:-:}" "DEBUG: Command line: RSYNC_PASSWORD=\"XXX\" $RSYNC_COMMAND ${!RSYNC_OPTS} ${RSYNC_VERBOSE[*]} ${!OPTIONS} ${!FILTER} $SRC ${!DESTDIR}" >&2 while :; do RSYNC_PASSWORD="${!PASSWORD}" "$RSYNC_COMMAND" "${!RSYNC_OPTS}" "${RSYNC_VERBOSE[@]}" "${!OPTIONS}" "${!FILTER}" "$SRC" "${!DESTDIR}" >&2 ERR_CODE="$?" @@ -365,7 +382,7 @@ for RUN in $(seq -s' ' 1 "$MAX_RUNS"); do fi echo "INFO: Begining processing of '$VAR' (run $RUN) at $(printf "%(%c)T")." >&2 - "$DEBUG" "DEBUG: Command line: $LFTP_COMMAND -c \"$LFTP_OPTIONS ${LFTP_VERBOSE[*]} ${!FILTER} ${!MIRROR}${!MODULE} ${!DESTDIR}\"" >&2 + "${DEBUG:-:}" "DEBUG: Command line: $LFTP_COMMAND -c \"$LFTP_OPTIONS ${LFTP_VERBOSE[*]} ${!FILTER} ${!MIRROR}${!MODULE} ${!DESTDIR}\"" >&2 while :; do "$LFTP_COMMAND" -c "$LFTP_OPTIONS ${LFTP_VERBOSE[*]} ${!FILTER} ${!MIRROR}/${!MODULE} ${!DESTDIR}" >&2 ERR_CODE="$?"