diff --git a/bin/install-site.sh b/bin/install-site.sh index 6ff8b72..d6e65fd 100755 --- a/bin/install-site.sh +++ b/bin/install-site.sh @@ -132,7 +132,7 @@ update_apt_sources() { echo -n "Updating APT sources... " if [ x"$DISTRIBUTION" = x"ubuntu" ] ; then case "$DISTVERSION" in - xenial|bionic|focal) + focal|jammy) : # Do nothing, these should have everything. ;; *) @@ -141,10 +141,6 @@ update_apt_sources() { esac elif [ x"$DISTRIBUTION" = x"debian" ] ; then case "$DISTVERSION" in - stretch) - BACKPORTS=true - SECURITY="$DISTVERSION/updates" - ;; buster) BACKPORTS=false SECURITY="$DISTVERSION/updates" @@ -153,6 +149,10 @@ update_apt_sources() { BACKPORTS=false SECURITY="$DISTVERSION-security" ;; + bookworm) + BACKPORTS=false + SECURITY="$DISTVERSION-security" + ;; *) notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION" ;; @@ -189,7 +189,7 @@ update_mysociety_apt_sources() { # We build packages targetted at Debian releases. # Try and select the most appropritate ones for Ubuntu. case "$DISTVERSION" in - xenial|stretch|bionic|buster|focal|bullseye) + focal|jammy|buster|bullseye|bookworm) cat > /etc/apt/sources.list.d/mysociety-debian.list < /etc/apt/sources.list.d/mysociety-debian.list <