From 608ac192b5cd814086b4eec1a06d2d07c42ca2f1 Mon Sep 17 00:00:00 2001
From: Cyteen <cyteen@ring-zero.co.uk>
Date: Fri, 3 Nov 2017 19:41:43 +0000
Subject: [PATCH] Changes the variable to not GROUPS since thats protected..

---
 001_apt-sources.sh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/001_apt-sources.sh b/001_apt-sources.sh
index b227a43..9927435 100644
--- a/001_apt-sources.sh
+++ b/001_apt-sources.sh
@@ -2,30 +2,30 @@
 rm /etc/apt/sources.list
 rm /etc/apt/sources.list.d/devuan
 
-ACTIVE=/etc/apt/sources.list.d/
-AVAILABLE=/etc/apt/sources.list-available/
+ACTIVE=/etc/apt/sources.list.d
+AVAILABLE=/etc/apt/sources.list-available
 mkdir -p "${AVAILABLE}"
 
-GROUPS=(main contrib non-free)
-ACTIVE_LIST=('devuan_ascii' 'devuan_ascii-security' 'devuan_ascii-updates' 'devuan_ascii-backports')
-INACTIVE_LIST=('devuan_jessie' 'devuan_jessie-security' 'devuan_jessie-updates' 'devuan_jessie-backports' 'devuan_beowulf' 'devuan_beowulf-security' 'devuan_beowulf-updates' 'devuan_beowulf-backports' 'devuan_ceres' 'devuan_experimental')
+SECTION=(main contrib non-free)
+ACTIVE_LIST=('ascii' 'ascii-security' 'ascii-updates' 'ascii-backports')
+INACTIVE_LIST=('jessie' 'jessie-security' 'jessie-updates' 'jessie-backports' 'beowulf' 'beowulf-security' 'beowulf-updates' 'beowulf-backports' 'ceres' 'experimental')
 
 echo ${#ACTIVE_LIST[@]}
 for RELEASE in "${ACTIVE_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/${RELEASE}.list" <<EOF
-deb http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
-deb-src http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+deb http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+deb-src http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
 EOF
-ln -sf "${AVAILABLE}"/"${RELEASE}".list "${ACTIVE}"/"${RELEASE}".list
+ln -sf "${AVAILABLE}"/devuan_"${RELEASE}".list "${ACTIVE}"/devuan_"${RELEASE}".list
 done
 
 echo ${#INACTIVE_LIST[@]}
 for RELEASE in "${INACTIVE_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/${RELEASE}.list" <<EOF
-deb http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
-deb-src http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+deb http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+deb-src http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
 EOF
 done
 
@@ -45,7 +45,8 @@ bash -c cat > "${AVAILABLE}"/docker.list <<EOF
 deb http://apt.dockerproject.org/repo debian-stretch main
 EOF
 ln -sf "${AVAILABLE}"/docker.list "${ACTIVE}"/docker.list
-bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
+bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyserv:w
+ers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
 
 apt-get update && apt-get install -y --force-yes devuan-keyring