refactor: refactor URL layout

Signed-off-by: Stephan Wendel <[email protected]>
mainsail-crew · Mar 21, 2024 · 8d8fa25 · 8d8fa25
1 parent 3342ab2
commit 8d8fa25
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/config/raspberry/default b/config/raspberry/default
@@ -4,7 +4,9 @@
 # Declare Variables before exporting.
 # See https://www.shellcheck.net/wiki/SC2155
 
-DOWNLOAD_BASE_URL="https://downloads.raspberrypi.com"
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_lite_arm64_latest"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent"
 
 BASE_IMAGE_ENLARGEROOT=4500
 BASE_IMAGE_RESIZEROOT=600
@@ -15,6 +17,8 @@ MODULES="base,pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinst
 
 # export Variables
 export DOWNLOAD_BASE_URL
+export DOWNLOAD_URL_CHECKSUM
+export DOWNLOAD_URL_IMAGE
 export BASE_IMAGE_ENLARGEROOT
 export BASE_IMAGE_RESIZEROOT
 export BASE_RELEASE_COMPRESS

diff --git a/config/raspberry/rpi32 b/config/raspberry/rpi32
@@ -9,9 +9,11 @@
 # DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.torrent"
 
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-12-06/2023-12-05-raspios-bullseye-armhf-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-12-06/2023-12-05-raspios-bullseye-armhf-lite.img.xz.torrent"
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-12-06"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-armhf-lite.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-armhf-lite.img.xz.torrent"
 
+export DOWNLOAD_BASE_URL
 export DOWNLOAD_URL_CHECKSUM
 export DOWNLOAD_URL_IMAGE
 

diff --git a/config/raspberry/rpi64 b/config/raspberry/rpi64
@@ -11,12 +11,14 @@ BASE_ARCH="arm64"
 # DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
 
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz.torrent"
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.torrent"
 
 
 # export variables
 export BASE_ARCH
+export DOWNLOAD_BASE_URL
 export DOWNLOAD_URL_CHECKSUM
 export DOWNLOAD_URL_IMAGE
 

diff --git a/config/raspberry/rpi64-ks b/config/raspberry/rpi64-ks
@@ -11,17 +11,20 @@ BASE_ARCH="arm64"
 # DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
 
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz.torrent"
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.torrent"
+
 # Changed modules
-# shellcheck disable=SC2034
 MODULES="base,pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,klipperscreen,crowsnest,sonar,password-for-sudo),postrename"
 
 
 # export variables
 export BASE_ARCH
+export DOWNLOAD_BASE_URL
 export DOWNLOAD_URL_CHECKSUM
 export DOWNLOAD_URL_IMAGE
+export MODULES
 
 ### JSON sniplet Setup
 ### NOTE: Please see all config files for setup variables!!!