diff options
author | Eric Hameleers <alien@slackware.com> | 2018-06-25 01:33:11 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-25 01:33:11 +0200 |
commit | 73fe3036fb6eebbe1e5e2f3b9d31e466e07637a5 (patch) | |
tree | ba5d19693b654bfd87c9d425bae826509615ea9e | |
parent | ff721ed31f2f299e3ae79b69f0bb3eb3a940d3ae (diff) | |
download | liveslak-73fe3036fb6eebbe1e5e2f3b9d31e466e07637a5.tar.gz liveslak-73fe3036fb6eebbe1e5e2f3b9d31e466e07637a5.tar.xz |
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'.
-rwxr-xr-x | make_slackware_live.sh | 19 |
1 files changed, 15 insertions, 4 deletions
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 <<EOPL >> 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 <<EOPL >> 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: |