Updates and fixes.

001_apt-sources.sh

@@ -17,15 +17,24 @@ TRANSPORT="https"
 #MIRROR=deb
 #MIRROR=pkgmaster
 MIRROR=deb
+MERGED_URI="${TRANSPORT}://${MIRROR}.devuan.org/merged/"
+DEVUAN_URI="${TRANSPORT}://${MIRROR}.devuan.org/devuan"
 ACTIVE=/etc/apt/sources.list.d
 AVAILABLE=/etc/apt/sources.list-available
 mkdir -p "${AVAILABLE}"
 
 SECTION=(main contrib non-free non-free-firmware)
+
+# For standard merged suites (main contrib non-free non-free-firmware)
+SECTION_MERGED="main contrib non-free non-free-firmware"
+#
+# For experimental / proposed (usually just main)
+SECTION_SPECIAL="main"
+
 # ACTIVE_LIST=('freia')
 # ACTIVE_LIST=('freia' 'freia-security' 'freia-updates' 'freia-backports')
-ACTIVE_LIST=('excalibur')
+# ACTIVE_LIST=('excalibur')
-ACTIVE_LIST=('excalibur' 'excalibur-security' 'excalibur-updates' 'excalibur-backports')
+# ACTIVE_LIST=('excalibur' 'excalibur-security' 'excalibur-updates' 'excalibur-backports')
 # ACTIVE_LIST=('daedalus')
 # ACTIVE_LIST=('daedalus' 'daedalus-security' 'daedalus-updates' 'daedalus-backports')
 # ACTIVE_LIST=('chimaera' 'chimaera-security' 'chimaera-updates' 'chimaera-backports')
@@ -38,33 +47,37 @@ OTHER_LIST=('experimental')
 
 SECTION=(main contrib non-free non-free-firmware)
 ACTIVE_LIST=('excalibur' 'excalibur-security' 'excalibur-updates' 'excalibur-backports')
-INACTIVE_LIST=('ascii' 'ascii-security' 'ascii-updates' 'ascii-backports')
 
-echo ${#ACTIVE_LIST[@]}
+# New: proposed-updates suites (disabled by default - production risk)
+PROPOSED_LIST=('excalibur-proposed-updates')
+
+# Active (enabled) loop – all merged in your current choice
 for RELEASE in "${ACTIVE_LIST[@]}"; do
   echo "${RELEASE}"
   bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.sources" <<-EOF
 	Enabled: yes
 	Types: deb deb-src
-        URIs: ${TRANSPORT}://${MIRROR}.devuan.org/merged/
+	URIs: ${MERGED_URI}
 	Suites: ${RELEASE}
-        Components: ${SECTION[*]}
+	Components: ${SECTION_MERGED}
 	Architectures: amd64
 	EOF
-    ln -sf "${AVAILABLE}"/devuan_"${RELEASE}".sources "${ACTIVE}"/devuan_"${RELEASE}".sources
+  ln -sf "${AVAILABLE}/devuan_${RELEASE}.sources" "${ACTIVE}/devuan_${RELEASE}.sources"
 done
 
-echo ${#INACTIVE_LIST[@]}
+# Special / other (experimental, and potentially *-proposed-updates later)
-for RELEASE in "${INACTIVE_LIST[@]}"; do
+for RELEASE in "${OTHER_LIST[@]}"; do
   echo "${RELEASE}"
   bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.sources" <<-EOF
-        Enabled: no
+	Enabled: yes
 	Types: deb deb-src
-        URIs: ${TRANSPORT}://${MIRROR}.devuan.org/merged/
+	URIs: ${DEVUAN_URI}
 	Suites: ${RELEASE}
-        Components: ${SECTION[*]}
+	Components: ${SECTION_SPECIAL}
 	Architectures: amd64
+	# Signed-By: /usr/share/keyrings/devuan-archive-keyring.gpg  # optional, if needed
 	EOF
+  ln -sf "${AVAILABLE}/devuan_${RELEASE}.sources" "${ACTIVE}/devuan_${RELEASE}.sources"
 done
 
 echo ${#OTHER_LIST[@]}
@@ -80,37 +93,65 @@ for RELEASE in "${OTHER_LIST[@]}"; do
 EOF
 done
 
-# ONION="devuanauxrkggcowgm2vcs6go3c5pgxdidd5wqjpg7zpfaxkmgspr6id.onion"
+# ────────────────────────────────────────────────
-# TRANSPORT="tor+http"
+# Proposed-updates loop (disabled by default)
-#
+# ────────────────────────────────────────────────
-# for RELEASE in "${OTHER_LIST[@]}"; do
+echo ${#PROPOSED_LIST[@]}
-#     echo "${RELEASE}"
+for RELEASE in "${PROPOSED_LIST[@]}"; do
-#     bash -c "cat > ${AVAILABLE}/devuan-onion_${RELEASE}.sources" <<-EOF
+  echo "${RELEASE}"
-#         Enabled: yes
+  bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.sources" <<-EOF
-#         Types: deb deb-src
+	Enabled: no
-#         URIs: ${TRANSPORT}://${ONION}/merged/
+	Types: deb deb-src
-#         Suites: ${RELEASE} ${RELEASE}-updates ${RELEASE}-security
+	URIs: ${DEVUAN_URI}
-#         Components: ${SECTION[*]}
+	Suites: ${RELEASE}
-#         Architectures: amd64
+	Components: ${SECTION_SPECIAL}
-#         EOF
+	Architectures: amd64
-# done
+	# Note: proposed-updates for upcoming point releases; not for production
+	EOF
+  # Optional symlink even if disabled
+  ln -sf "${AVAILABLE}/devuan_${RELEASE}.sources" "${ACTIVE}/devuan_${RELEASE}.sources"
+done
 
-#bash -c "cat > ${AVAILABLE}/saltstack.list" <<EOF
+# Onion setup (uncomment/adapt as needed)
+ONION="devuanauxrkggcowgm2vcs6go3c5pgxdidd5wqjpg7zpfaxkmgspr6id.onion"
+TOR_TRANSPORT="tor+http"
+TOR_MERGED_URI="${TOR_TRANSPORT}://${ONION}/merged/"
+TOR_DEVUAN_URI="${TOR_TRANSPORT}://${ONION}/devuan"
+
+# Which suites get onion variants? (e.g. active + experimental/proposed)
+# You can make ONION_LIST=("${ACTIVE_LIST[@]}" "${OTHER_LIST[@]}" "${PROPOSED_LIST[@]}")
+ONION_LIST=('excalibur' 'excalibur-security' 'excalibur-updates' 'excalibur-backports' 'experimental' 'excalibur-proposed-updates')
+
+# ────────────────────────────────────────────────
+# Onion / Tor variants (optional - create separate files)
+# ────────────────────────────────────────────────
+# Uncomment the block below if you want Tor variants generated
 #
-#deb http://debian.saltstack.com/debian stretch-saltstack main
+echo "Generating onion variants for: ${ONION_LIST[*]}"
-#EOF
+for RELEASE in "${ONION_LIST[@]}"; do
-#ln -sf "${AVAILABLE}"/saltstack.list "${ACTIVE}"/saltstack.list
+  echo "${RELEASE} (onion)"
-#
+
-#
+  # Decide URI based on suite type (same logic as clearnet)
-## the docker packages have go over to systemd so these wont install
+  if [[ "$RELEASE" == *proposed-updates || "$RELEASE" == "experimental" ]]; then
-#bash -c cat > "${AVAILABLE}"/docker.list <<EOF
+    TOR_URI="${TOR_DEVUAN_URI}"
-#
+    SECTION_USED="${SECTION_SPECIAL}"
-## Debian stretch
+  else
-#deb http://apt.dockerproject.org/repo debian-stretch main
+    TOR_URI="${TOR_MERGED_URI}"
-#EOF
+    SECTION_USED="${SECTION_MERGED}" # assume you defined SECTION_MERGED earlier as "main contrib non-free non-free-firmware"
-#ln -sf "${AVAILABLE}"/docker.list "${ACTIVE}"/docker.list
+  fi
-#
+
-##apt update && apt install -y --force-yes devuan-keyring
+  bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}-onion.sources" <<-EOF
+	Enabled: no          # change to yes if you run tor and want default onion
+	Types: deb deb-src
+	URIs: ${TOR_URI}
+	Suites: ${RELEASE}
+	Components: ${SECTION_USED}
+	Architectures: amd64
+	# Tor / onion routing - requires apt-transport-tor installed and tor running
+	EOF
+
+  ln -sf "${AVAILABLE}/devuan_${RELEASE}-onion.sources" "${ACTIVE}/devuan_${RELEASE}-onion.sources"
+done
 
 rm /etc/apt/sources.list