1
0
mirror of https://github.com/lxc/lxc-templates.git synced 2024-12-22 22:40:16 +00:00

plamo: Support https as download scheme and default to https

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
This commit is contained in:
KATOH Yasufumi 2019-04-02 16:01:13 +09:00
parent 71c91d48ed
commit 937758dba9

View File

@ -52,7 +52,10 @@ download_plamo() {
# download a mini plamo into a cache # download a mini plamo into a cache
echo "Downloading Plamo-$release minimal..." echo "Downloading Plamo-$release minimal..."
cd $ptcache cd $ptcache
case $DLSCHEME in http) depth=2 ;; ftp) depth=3 ;; esac case $DLSCHEME in
http|https) depth=2 ;;
ftp) depth=3 ;;
esac
rej=${IGNOREPKGS%% *} ; [ -n "$rej" ] && rej="$rej-*" rej=${IGNOREPKGS%% *} ; [ -n "$rej" ] && rej="$rej-*"
if [ `echo $IGNOREPKGS | wc -w` -gt 1 ] ; then if [ `echo $IGNOREPKGS | wc -w` -gt 1 ] ; then
for p in ${IGNOREPKGS#* } ; do rej="$rej,$p-*" ; done for p in ${IGNOREPKGS#* } ; do rej="$rej,$p-*" ; done
@ -429,7 +432,7 @@ else
ADDONPKGS=${ADDONPKGS-"`echo contrib/Hamradio/{morse,qrq}`"} ADDONPKGS=${ADDONPKGS-"`echo contrib/Hamradio/{morse,qrq}`"}
fi fi
DLSCHEME=${DLSCHEME:-"http"} DLSCHEME=${DLSCHEME:-"https"}
MIRRORSRV=${MIRRORSRV:-"repository.plamolinux.org"} MIRRORSRV=${MIRRORSRV:-"repository.plamolinux.org"}
MIRRORPATH=${MIRRORPATH:-"/pub/linux/Plamo"} MIRRORPATH=${MIRRORPATH:-"/pub/linux/Plamo"}
CATEGORIES=${CATEGORIES-"00_base 01_minimum"} CATEGORIES=${CATEGORIES-"00_base 01_minimum"}