diff --git a/src/steps-config/10-apt-cache.sh b/src/steps-config/10-apt-cache.sh index c51029c..099bdfe 100755 --- a/src/steps-config/10-apt-cache.sh +++ b/src/steps-config/10-apt-cache.sh @@ -11,22 +11,16 @@ enable_apt_cache() { # From /etc/os-release - see run.sh if [[ "${ID}" == "raspbian" ]]; then - 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 ]"; + subtask_begin "Patching for Raspbian"; if [[ -e "/etc/apt/sources.list.d/raspi" ]]; then rm /etc/apt/sources.list.d/raspi; fi subtask_end "$?"; fi + # HTTPS doesn't allow for our proxy to cache it 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'; subtask_end "$?";