Compare commits

..

No commits in common. "bfb593f29c0ec23fa07ae88b4bf44d95f13f5dec" and "af20c7f0299402de6096dd4ec09b95e0519ffee0" have entirely different histories.

2 changed files with 10 additions and 4 deletions

View file

@ -11,16 +11,22 @@ enable_apt_cache() {
# From /etc/os-release - see run.sh # From /etc/os-release - see run.sh
if [[ "${ID}" == "raspbian" ]]; then if [[ "${ID}" == "raspbian" ]]; then
subtask_begin "Patching for Raspbian"; subtask_begin "Patching for Raspbian [ 1 / 2 ]";
# HTTPS doesn't allow for our proxy to cache it
if [[ -r "/etc/apt/sources.list.d/raspi.list" ]]; then
sed -i 's/https:/http:/g' /etc/apt/sources.list.d/raspi.list
fi
subtask_end "$?";
subtask_begin "Patching for Raspbian [ 2 / 2 ]";
if [[ -e "/etc/apt/sources.list.d/raspi" ]]; then if [[ -e "/etc/apt/sources.list.d/raspi" ]]; then
rm /etc/apt/sources.list.d/raspi; rm /etc/apt/sources.list.d/raspi;
fi fi
subtask_end "$?"; subtask_end "$?";
fi fi
# HTTPS doesn't allow for our proxy to cache it
subtask_begin "Reconfiguring existing apt sources https → http"; subtask_begin "Reconfiguring existing apt sources https → http";
sed -i 's/https:/http:/g' /etc/apt/sources.list; sed -i 's/https:\/\//http:\/\//g' /etc/apt/sources.list;
find /etc/apt/sources.list.d/ -type f -iname '*.list' -print0 | xargs -0 -n1 sed -i 's/https:\/\//http:\/\//g'; find /etc/apt/sources.list.d/ -type f -iname '*.list' -print0 | xargs -0 -n1 sed -i 's/https:\/\//http:\/\//g';
subtask_end "$?"; subtask_end "$?";

View file

@ -7,7 +7,7 @@ echo 'deb http://apt.starbeamrainbowlabs.com/ ./ # apt.starbeamrainbowlabs.com'
subtask_end "$?" "Error: Failed to write apt repository sources"; subtask_end "$?" "Error: Failed to write apt repository sources";
subtask_begin "Importing GPG signing key"; subtask_begin "Importing GPG signing key";
curl -sSL https://apt.starbeamrainbowlabs.com/aptosaurus.asc >/etc/apt/trusted.gpg.d/sbrl.asc curl -sSL https://apt.starbeamrainbowlabs.com/aptosaurus.asc -O- | sudo tee /etc/apt/trusted.gpg.d/sbrl.asc
subtask_end "$?" "Error: Failed to import GPG signing key"; subtask_end "$?" "Error: Failed to import GPG signing key";
task_end "$?" "Error: Failed to configure apt.starbeamrainbowlabs.com apt repository" task_end "$?" "Error: Failed to configure apt.starbeamrainbowlabs.com apt repository"