kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00
Code Activity

Merge branch 'apt_improvements' into 'master'

Browse Source 
Apt improvements

Closes #600

See merge request fdroid/fdroidserver!600
This commit is contained in:
Marcus 2018-11-28 11:28:33 +00:00
commit cf81d198ff
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
buildserver/provision-apt-get-install
View File

@ -16,9 +16,12 @@ printf 'APT::Acquire::Retries "20";\n' \
printf 'APT::Periodic::Update-Package-Lists "0";\nAPT::Periodic::Unattended-Upgrade "0";\n' \
> /etc/apt/apt.conf.d/99no-auto-updates
printf 'APT::Get::Assume-Yes "true";\n' \
> /etc/apt/apt.conf.d/99assumeyes
if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then
apt-get -y update || apt-get -y update
apt-get -y install apt-transport-https ca-certificates
apt-get update || apt-get update
apt-get install apt-transport-https ca-certificates
fi
cat << EOF > /etc/apt/sources.list
@ -32,9 +35,10 @@ printf "Package: *\nPin: release o=Debian,a=testing\nPin-Priority: -300\n" > /et
dpkg --add-architecture i386
apt-get -y update || apt-get -y update
apt-get -y upgrade --download-only
apt-get -y upgrade
apt-get update || apt-get update
apt-get upgrade --download-only
apt-get upgrade
apt-get dist-upgrade
packages="
ant
@ -109,8 +113,8 @@ packages="
zip
zlib1g:i386
"
apt-get install --yes $packages --download-only
apt-get install --yes $packages
apt-get install $packages --download-only
apt-get install $packages
highestjava=`update-java-alternatives --list | sort -n | tail -1 | cut -d ' ' -f 1`
update-java-alternatives --set $highestjava

1
buildserver/setup-env-vars
View File

@ -11,6 +11,7 @@ echo "# generated on "`date` > $bsenv
echo export ANDROID_HOME=$1 >> $bsenv
echo 'export PATH=$PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:/opt/gradle/bin' >> $bsenv
echo "export DEBIAN_FRONTEND=noninteractive" >> $bsenv
chmod 0644 $bsenv