Change module url to ring-zero.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "beowulf/scripts"]
 	path = beowulf/scripts
-	url = ssh://git@git.ring-zero.co.uk:10022/scripts/automate.git
+	url = git@git.ring-zero.co.uk:scripts/automate.git

devuan-beowulf-live-e17.blend

@@ -49,8 +49,6 @@ blend_preinst() {
 	else
 		notice "no blend-specific scripts found in ${blend_release_path}/automate"
 	fi
-
-	enable_apt-proxy
 }
 
 blend_postinst() {
@@ -68,8 +66,18 @@ blend_postinst() {
 	install-custdebs || zerr
 	install-custscripts || zerr
 
+	## remove the apt-proxy if present
+	#if [ -f ${strapdir}/etc/apt/apt.conf.d/02proxy ]; then
+	#	rm ${strapdir}/etc/apt/apt.conf.d/02proxy
+	#fi
+
+	## When changes are done to /root and we want those changes transfered 
+	# to the live default user but not all future users we use a tmp skel 
+	# with system skel copied in.
+#        rsync -avzP --no-o --no-g /etc/skel ${strapdir}/tmp/skel
+#        rsync -avzP --no-o --no-g ${strapdir}/root/ ${strapdir}/tmp/skel
+
 	blend_finalize || zerr
-	disable_apt-proxy
 }
 
 iso_write_isolinux_cfg() {
@@ -464,7 +472,7 @@ install-custscripts() {
 #!/bin/sh
 cd /var/tmp/automate
 for script in ${custom_scripts}; do
-	touch \${script}.log
+	touch \${$script:r}.log
 	bash \$script
 done
 apt-get --yes --force-yes -f install
@@ -506,8 +514,8 @@ enable_apt-proxy() {
 	cat << EOF | sudo tee ${strapdir}/addproxy
 #!/bin/sh
 
-cat > /etc/apt/apt.conf.d/02proxy << 'FOE'
-Acquire::http { Proxy "${apt_proxy}"; };
+cat > /etc/apt/apt.conf.d/02proxy' << 'FOE'
+Acquire::http { Proxy \"${apt_proxy}\"; };
 FOE
 
 EOF
@@ -521,10 +529,7 @@ disable_apt-proxy() {
 
 	cat << EOF | sudo tee ${strapdir}/delproxy
 #!/bin/sh
-#sed '/^${apt_proxy}/d' /etc/apt/apt.conf.d/02proxy
-if [ -f /etc/apt/apt.conf.d/02proxy ]; then
-	rm /etc/apt/apt.conf.d/02proxy
-fi
+sed '/^${apt_proxy}/d' /etc/apt/apt.conf.d/02proxy
 EOF
 	chroot-script delproxy || zerr
 }