mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'apt_get_update' into 'master'
provisioners: work around apt-get update problem See merge request fdroid/fdroidserver!590
This commit is contained in:
commit
568256f75c
@ -16,7 +16,7 @@ printf 'APT::Periodic::Update-Package-Lists "0";\nAPT::Periodic::Unattended-Upgr
|
|||||||
> /etc/apt/apt.conf.d/99no-auto-updates
|
> /etc/apt/apt.conf.d/99no-auto-updates
|
||||||
|
|
||||||
if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then
|
if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then
|
||||||
apt-get -y update
|
apt-get -y update || apt-get -y update
|
||||||
apt-get -y install apt-transport-https ca-certificates
|
apt-get -y install apt-transport-https ca-certificates
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -30,7 +30,7 @@ fi
|
|||||||
|
|
||||||
dpkg --add-architecture i386
|
dpkg --add-architecture i386
|
||||||
|
|
||||||
apt-get -y update
|
apt-get -y update || apt-get -y update
|
||||||
apt-get -y upgrade --download-only
|
apt-get -y upgrade --download-only
|
||||||
apt-get -y upgrade
|
apt-get -y upgrade
|
||||||
|
|
||||||
|
@ -8,4 +8,4 @@ echo "Acquire::ftp::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy
|
|||||||
echo "Acquire::http::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy
|
echo "Acquire::http::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy
|
||||||
echo "Acquire::https::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy
|
echo "Acquire::https::Proxy \"$1\";" >> /etc/apt/apt.conf.d/02proxy
|
||||||
|
|
||||||
apt-get update
|
apt-get update || apt-get update
|
||||||
|
Loading…
Reference in New Issue
Block a user