From bed14b11e3d3070b92bb66203ae42d9e31393299 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Fri, 7 Feb 2020 12:16:48 +0100 Subject: Make mirror URL configurable via the environment. --- slackupgrade | 6 +++--- slackupgrade.8 | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/slackupgrade b/slackupgrade index ff4d46f..ada387b 100644 --- a/slackupgrade +++ b/slackupgrade @@ -21,6 +21,7 @@ set -e # Configuration directory : ${SLACKUPGRADE_CONFDIR:=/etc/slackupgrade} : ${SLACKUPGRADE_PKGDIR:=/var/slackupgrade} +: ${SLACKUPGRADE_MIRRORS_URL:=https://mirrors.slackware.com/slackware} # Slackware root directory rooturl= # Log file name @@ -461,10 +462,9 @@ fi tempdir_create cd $tempdir -mirrors_url=https://mirrors.slackware.com/slackware if [ -z "$rooturl" ]; then dnfunc_init - if ! $dnfunc index.html $mirrors_url; then + if ! $dnfunc index.html $SLACKUPGRADE_MIRRORS_URL; then abend "exiting" exit 1 fi @@ -475,7 +475,7 @@ if [ -z "$rooturl" ]; then -e 's/.*^a href="slackware'$ARCH'-([[:digit:].]+)\/?".*/\1/p'|\ sed -n -e "/$version_rx/{" -en -ep -e '}' ) if [ -n "$new_version" ]; then - rooturl="$mirrors_url/slackware$ARCH-$new_version" + rooturl="$SLACKUPGRADE_MIRRORS_URL/slackware$ARCH-$new_version" info "using $rooturl as distribution top-level URL" else abend "can't find distribution newer than $VERSION; please supply URL if you have any" diff --git a/slackupgrade.8 b/slackupgrade.8 index d58b0e7..ef15eb9 100644 --- a/slackupgrade.8 +++ b/slackupgrade.8 @@ -319,6 +319,10 @@ Location of the \fBslackupgrade\fR package spool directory. This is the temporary storage for downloaded package tarballs. The default is .BR /var/slackupgrade . .TP +.B SLACKUPGRADE_MIRRORS_URL +URL of the Slackware mirros site. The default is +.BR https://mirrors.slackware.com/slackware . +.TP .B TMP Location of the temporary directory. The default is .BR /tmp . -- cgit v1.2.1