From 73fe3036fb6eebbe1e5e2f3b9d31e466e07637a5 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 25 Jun 2018 01:33:11 +0200 Subject: Use correct 'ktown' URL in slackpkgplus.conf If we use 'testing' repository to get the Plasma 5 packages, then the slackpkg/slackpkg+ configuration should reference that 'testing' URL as well, to avoid confusion when the user runs 'slackpkg upgrade-all'. --- make_slackware_live.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'make_slackware_live.sh') diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 081b8c4..0196172 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1368,13 +1368,24 @@ GREYLIST=on PKGS_PRIORITY=( restricted alienbob ktown mate ) REPOPLUS=( slackpkgplus restricted alienbob ktown mate ) MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ -MIRRORPLUS['restricted']=http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/${SL_VERSION}/${SL_ARCH}/ -MIRRORPLUS['alienbob']=http://bear.alienbase.nl/mirrors/people/alien/sbrepos/${SL_VERSION}/${SL_ARCH}/ -#MIRRORPLUS['ktown_testing']=http://bear.alienbase.nl/mirrors/alien-kde/${SL_VERSION}/testing/${SL_ARCH}/ -MIRRORPLUS['ktown']=http://bear.alienbase.nl/mirrors/alien-kde/${SL_VERSION}/latest/${SL_ARCH}/ +MIRRORPLUS['restricted']=http://slackware.nl/people/alien/restricted_sbrepos/${SL_VERSION}/${SL_ARCH}/ +MIRRORPLUS['alienbob']=http://slackware.nl/people/alien/sbrepos/${SL_VERSION}/${SL_ARCH}/ MIRRORPLUS['mate']=http://slackware.uk/msb/${SL_VERSION}/latest/${SL_ARCH}/ #MIRRORPLUS['studioware']=http://slackware.uk/studioware/${SL_VERSION}/ EOPL + # Use the appropriate ktown variant: + eval $( grep "^ *VARIANT=" ${LIVE_TOOLDIR}/pkglists/plasma5.conf) + if [ "$VARIANT" = "latest" ]; then + cat <> etc/slackpkg/slackpkgplus.conf +#MIRRORPLUS['ktown']=http://slackware.nl/alien-kde/${SL_VERSION}/testing/${SL_ARCH}/ +MIRRORPLUS['ktown']=http://slackware.nl/alien-kde/${SL_VERSION}/latest/${SL_ARCH}/ +EOPL + else + cat <> etc/slackpkg/slackpkgplus.conf +#MIRRORPLUS['ktown']=http://slackware.nl/alien-kde/${SL_VERSION}/latest/${SL_ARCH}/ +MIRRORPLUS['ktown']=http://slackware.nl/alien-kde/${SL_VERSION}/testing/${SL_ARCH}/ +EOPL + fi fi # Slackpkg wants you to opt-in on slackware-current: -- cgit v1.2.3