diff --git a/install/cockpit-install.sh b/install/cockpit-install.sh index 7c589bd10..f29815d8d 100644 --- a/install/cockpit-install.sh +++ b/install/cockpit-install.sh @@ -15,42 +15,33 @@ network_check update_os msg_info "Installing Cockpit" -source /etc/os-release +CODENAME=$(get_os_info codename) cat </etc/apt/sources.list.d/debian-backports.sources Types: deb deb-src URIs: http://deb.debian.org/debian -Suites: ${VERSION_CODENAME}-backports +Suites: ${CODENAME}-backports Components: main Enabled: yes Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg EOF $STD apt update -$STD apt install -t ${VERSION_CODENAME}-backports cockpit cracklib-runtime --no-install-recommends -y +$STD apt install -t ${CODENAME}-backports cockpit cracklib-runtime --no-install-recommends -y sed -i "s/root//g" /etc/cockpit/disallowed-users msg_ok "Installed Cockpit" # 45Drives only publishes amd64 packages [[ "$(arch_resolve)" == "arm64" ]] || read -r -p "Would you like to install 45Drives' cockpit-file-sharing, cockpit-identities, and cockpit-navigator " prompt if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then - install_45drives=true - if [[ "${VERSION_ID}" -ge 14 ]]; then - read -r -p "Debian ${VERSION_ID} is not officially supported by 45Drives yet, would you like to continue anyway? " prompt - if [[ ! "${prompt,,}" =~ ^(y|yes)$ ]]; then - install_45drives=false - fi - fi - if [[ "$install_45drives" == "true" ]]; then - msg_info "Installing 45Drives' cockpit extensions" - setup_deb822_repo "45drives" \ - "https://repo.45drives.com/key/gpg.asc" \ - "https://repo.45drives.com/enterprise/debian" \ - "${VERSION_CODENAME}" \ - "main" \ - "amd64" - $STD apt install -y cockpit-file-sharing cockpit-identities cockpit-navigator - msg_ok "Installed 45Drives' cockpit extensions" - fi + msg_info "Installing 45Drives' cockpit extensions" + setup_deb822_repo "45drives" \ + "https://repo.45drives.com/key/gpg.asc" \ + "https://repo.45drives.com/enterprise/debian" \ + "${CODENAME}" \ + "main" \ + "amd64" + $STD apt install -y cockpit-file-sharing cockpit-identities cockpit-navigator + msg_ok "Installed 45Drives' cockpit extensions" fi motd_ssh