From fa2103f0ef63e2c095a7faf3a8a3a3c839f04182 Mon Sep 17 00:00:00 2001
From: TrudeEH <ehtrude@gmail.com>
Date: Wed, 11 Jun 2025 09:56:00 +0100
Subject: [PATCH] Improve debian sources setup

---
 install.sh           | 27 +++++++++++++++++++++++----
 stable-sources.list  |  9 ---------
 testing-sources.list |  8 --------
 3 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 stable-sources.list
 delete mode 100644 testing-sources.list

diff --git a/install.sh b/install.sh
index 18f53331..9d19a58f 100755
--- a/install.sh
+++ b/install.sh
@@ -90,10 +90,11 @@ echo
 
 # Install Programs
 if [ "$reload" = false ]; then
+   testing_branch="trixie"
    echo "Debian Sources:"
    echo "1) Stable"
-   echo "2) Testing"
-   echo "3) Skip (Do not change)"
+   echo "2) Testing ($testing_branch)"
+   echo "3) Skip ($(lsb_release -c -s))"
    printf "Enter your choice: "
 
    while read -r REPLY; do
@@ -101,13 +102,31 @@ if [ "$reload" = false ]; then
       1)
          echo "${CYAN}Using Stable sources.${NC}"
          sudo cp /etc/apt/sources.list /etc/apt/sources.list.bckp
-         sudo cp stable-sources.list /etc/apt/sources.list
+         sudo sh -c 'cat > /etc/apt/sources.list <<EOF
+deb http://deb.debian.org/debian stable main contrib non-free
+deb-src http://deb.debian.org/debian stable main contrib non-free
+
+deb http://security.debian.org/debian-security stable-security main contrib non-free
+deb-src http://security.debian.org/debian-security stable-security main contrib non-free
+
+deb http://deb.debian.org/debian stable-updates main contrib non-free
+deb-src http://deb.debian.org/debian stable-updates main contrib non-free
+EOF'
          break
          ;;
       2)
          echo "${CYAN}Using Testing sources.${NC}"
          sudo cp /etc/apt/sources.list /etc/apt/sources.list.bckp
-         sudo cp testing-sources.list /etc/apt/sources.list
+         sudo sh -c "cat > /etc/apt/sources.list <<EOF
+deb http://deb.debian.org/debian $testing_branch main contrib non-free
+deb-src http://deb.debian.org/debian $testing_branch main contrib non-free
+
+deb http://security.debian.org/debian-security $testing_branch-security main contrib non-free
+deb-src http://security.debian.org/debian-security $testing_branch-security main contrib non-free
+
+deb http://deb.debian.org/debian $testing_branch-updates main contrib non-free
+deb-src http://deb.debian.org/debian $testing_branch-updates main contrib non-free
+EOF"
          break
          ;;
       3)
diff --git a/stable-sources.list b/stable-sources.list
deleted file mode 100644
index f83a968c..00000000
--- a/stable-sources.list
+++ /dev/null
@@ -1,9 +0,0 @@
-deb https://deb.debian.org/debian stable main contrib non-free non-free-firmware
-deb-src https://deb.debian.org/debian stable main contrib non-free non-free-firmware
-
-deb https://security.debian.org/debian-security stable-security main contrib non-free non-free-firmware
-deb-src https://security.debian.org/debian-security stable-security main contrib non-free non-free-firmware
-
-deb https://deb.debian.org/debian stable-updates main contrib non-free non-free-firmware
-deb-src https://deb.debian.org/debian stable-updates main contrib non-free non-free-firmware
-
diff --git a/testing-sources.list b/testing-sources.list
deleted file mode 100644
index 015300a7..00000000
--- a/testing-sources.list
+++ /dev/null
@@ -1,8 +0,0 @@
-deb http://deb.debian.org/debian/ trixie main contrib non-free non-free-firmware
-deb-src http://deb.debian.org/debian/ trixie main contrib non-free non-free-firmware
-
-deb http://security.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
-deb-src http://security.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
-
-deb https://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware
-deb-src https://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware