From 7cb0298abcae61dcad4e2f674e6a28e6f56ab62f Mon Sep 17 00:00:00 2001
From: Blieque Mariguan <himself@blieque.co.uk>
Date: Sun, 2 Feb 2025 00:59:58 +0000
Subject: [PATCH] feat: Use deb822 format for APT sources

- Replace `armbian-config.list` with `armbian-config.sources`. This
  holds the same information in a newer format, deb822. This does not
  affect `armbian.list`, but I could look at migrating that too if there
  is interest.
- Update `README.md` accordingly.
---
 README.md                               | 24 ++++++++++++++----------
 debian.conf                             |  2 +-
 tools/repository/armbian-config.list    |  1 -
 tools/repository/armbian-config.sources |  5 +++++
 4 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 tools/repository/armbian-config.list
 create mode 100644 tools/repository/armbian-config.sources

diff --git a/README.md b/README.md
index fee422d3f..a142d4d3b 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 <a href=https://github.com/armbian/configng/actions/workflows/debian.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/configng/debian.yml?logo=githubactions&label=Packaging&style=for-the-badge&branch=main"></a> <a href=https://github.com/armbian/configng/actions/workflows/unit-tests.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/configng/unit-tests.yml?logo=githubactions&label=Unit%20tests&style=for-the-badge&branch=main"></a> <a href=https://github.com/armbian/configng/actions/workflows/docs.yml><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/armbian/configng/docs.yml?logo=githubactions&label=Documentation&style=for-the-badge&branch=main"></a>
 </p>
 
-**armbian-config** provides configuration and installation routines for customizing and automating tasks within Armbian Linux environment. These utilties help streamline setup processes for various use cases.
+**armbian-config** provides configuration and installation routines for customizing and automating tasks within Armbian Linux environment. These utilities help streamline setup processes for various use cases.
 
 <a href=#><img src=.github/images/common.png></a>
 
@@ -15,19 +15,19 @@
 - **Lightweight**: Minimal dependencies for optimal performance.
 - **Flexible**: Supports JSON, TUI, CLI, and API interfaces.
 - **Modern**: A fresh approach to configuration.
-- **Low entropy**: Byte clean uninstall for most targets
+- **Low entropy**: Byte clean uninstall for most targets.
 
 ## Features
 
 - **System Configuration**: 
-  - kernel manamenent, headers, hardware tweaks.
+  - Kernel management, headers, hardware tweaks.
   - NFS and ZFS storage management.
   - SSH user access tweaks.
-  - system updates, rolling / stable, containers update.
+  - System updates, rolling / stable, containers update.
 - **Network Management**: 
-  - fixed / dynamic IP configuration.
-  - connecting to wireless network.
-  - access point management.
+  - Fixed / dynamic IP configuration.
+  - Connecting to wireless network.
+  - Access point management.
 - **Localization Settings**: 
   - Configure time zone.
   - Set language and locales.
@@ -61,9 +61,13 @@ Add Armbian key + repository and install the tool:
 ```bash
 wget -qO - https://apt.armbian.com/armbian.key | gpg --dearmor | \
 sudo tee /usr/share/keyrings/armbian.gpg > /dev/null
-echo "deb [signed-by=/usr/share/keyrings/armbian.gpg] \
-https://github.armbian.com/configng stable main" | \
-sudo tee /etc/apt/sources.list.d/armbian-config.list > /dev/null
+cat << EOF | sudo tee /etc/apt/sources.list.d/armbian-config.sources > /dev/null
+Types: deb
+URIs: https://github.armbian.com/configng
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/armbian.gpg
+EOF
 sudo apt update
 sudo apt -y install armbian-config
 ```
diff --git a/debian.conf b/debian.conf
index 5d09b11b5..565693cd3 100644
--- a/debian.conf
+++ b/debian.conf
@@ -1,4 +1,4 @@
 lib:/usr/
 bin:/usr/
 share:/usr/
-tools/repository/armbian-config.list:/etc/apt/sources.list.d/
+tools/repository/armbian-config.sources:/etc/apt/sources.list.d/
diff --git a/tools/repository/armbian-config.list b/tools/repository/armbian-config.list
deleted file mode 100644
index eb01b105f..000000000
--- a/tools/repository/armbian-config.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/armbian.gpg] https://github.armbian.com/configng stable main
diff --git a/tools/repository/armbian-config.sources b/tools/repository/armbian-config.sources
new file mode 100644
index 000000000..32d0b34c7
--- /dev/null
+++ b/tools/repository/armbian-config.sources
@@ -0,0 +1,5 @@
+Types: deb
+URIs: https://github.armbian.com/configng
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/armbian.gpg