src/steps-config/10-apt-cache.sh

@@ -11,16 +11,22 @@ enable_apt_cache() {
 	
 	# From /etc/os-release - see run.sh
 	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
 			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 "$?";
 	

src/steps-preinstall/5-apt-sbrl.sh

@@ -7,7 +7,7 @@ echo 'deb http://apt.starbeamrainbowlabs.com/ ./ # apt.starbeamrainbowlabs.com'
 subtask_end "$?" "Error: Failed to write apt repository sources";
 
 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";
 
 task_end "$?" "Error: Failed to configure apt.starbeamrainbowlabs.com apt repository"