From 3cd238b940dda742e815c7104df76fe7b23b8eaa Mon Sep 17 00:00:00 2001 From: Jalakas Date: Tue, 29 Jul 2025 13:26:31 +0000 Subject: [PATCH 1/3] install-open-eid: improve warning messages install-open-eid: improve warning messages Signed-off-by: Anari Jalakas --- install-open-eid.sh | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/install-open-eid.sh b/install-open-eid.sh index 946fc1f..5bef6da 100755 --- a/install-open-eid.sh +++ b/install-open-eid.sh @@ -135,11 +135,11 @@ case $distro in # Debian lacks https support for apt, by default sudo apt install apt-transport-https case "$codename" in - bookworm) - make_warn "Debian $codename is not officially supported" - make_warn "Installing from ubuntu-jammy repository" - add_repository jammy - ;; + bookworm) + make_warn "Debian $codename is not officially supported" + make_warn "Trying to install packages from Ubuntu jammy repository" + add_repository jammy + ;; *) make_fail "Debian $codename is not officially supported" ;; @@ -147,8 +147,11 @@ case $distro in ;; ubuntu|neon|zorin|tuxedo) case $distro in - neon) make_warn "Neon is not officially supported; assuming that it is equivalent to Ubuntu" ;; - *) ;; + neon) + make_warn "Neon is not officially supported; assuming that it is equivalent to Ubuntu" + ;; + *) + ;; esac case $codename in utopic|vivid|wily|trusty|artful|cosmic|disco|xenial|eoan|groovy|hirsute|impish|bionic|zorin|kinetic|lunar|mantic|focal) @@ -159,7 +162,7 @@ case $distro in ;; *) make_warn "Ubuntu $codename is not officially supported" - make_warn "Trying to install package for Ubuntu ${LATEST_SUPPORTED_UBUNTU_CODENAME}" + make_warn "Trying to install packages from Ubuntu ${LATEST_SUPPORTED_UBUNTU_CODENAME} repository" add_repository ${LATEST_SUPPORTED_UBUNTU_CODENAME} ;; esac @@ -168,10 +171,12 @@ case $distro in case $release in 22*) make_warn "Linux Mint 22 is not officially supported" + make_warn "Trying to install packages from Ubuntu noble repository" add_repository noble ;; 21*) make_warn "Linux Mint 21 is not officially supported" + make_warn "Trying to install packages from Ubuntu jammy repository" add_repository jammy ;; *) @@ -183,6 +188,7 @@ case $distro in case $release in 7*) make_warn "Elementary OS 7 is not officially supported" + make_warn "Trying to install packages from Ubuntu jammy repository" add_repository jammy ;; *) @@ -197,11 +203,12 @@ case $distro in ;; jammy) make_warn "Pop!_OS $codename is not officially supported" + make_warn "Trying to install packages from Ubuntu $codename repository" add_repository $codename ;; *) make_warn "Pop!_OS $codename is not officially supported" - make_warn "Trying to install package for Pop!_OS ${LATEST_SUPPORTED_UBUNTU_CODENAME}" + make_warn "Trying to install packages from Ubuntu ${LATEST_SUPPORTED_UBUNTU_CODENAME} repository" add_repository ${LATEST_SUPPORTED_UBUNTU_CODENAME} ;; esac From 0a516cbe19f8ce86545c99d98f8d06965c6a55c8 Mon Sep 17 00:00:00 2001 From: Jalakas Date: Tue, 29 Jul 2025 13:28:26 +0000 Subject: [PATCH 2/3] install-open-eid: add debian trixie Signed-off-by: Anari Jalakas --- install-open-eid.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/install-open-eid.sh b/install-open-eid.sh index 5bef6da..07b4a3e 100755 --- a/install-open-eid.sh +++ b/install-open-eid.sh @@ -135,6 +135,11 @@ case $distro in # Debian lacks https support for apt, by default sudo apt install apt-transport-https case "$codename" in + trixie) + make_warn "Debian $codename is not officially supported" + make_warn "Trying to install packages from Ubuntu plucky repository" + add_repository plucky + ;; bookworm) make_warn "Debian $codename is not officially supported" make_warn "Trying to install packages from Ubuntu jammy repository" From 7332f46628ed3b1ee7544353dab6b3d0d11a5e25 Mon Sep 17 00:00:00 2001 From: Jalakas Date: Tue, 29 Jul 2025 13:52:36 +0000 Subject: [PATCH 3/3] install-open-eid: don't treat pop os differently from ubuntu Signed-off-by: Anari Jalakas --- install-open-eid.sh | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/install-open-eid.sh b/install-open-eid.sh index 07b4a3e..a839353 100755 --- a/install-open-eid.sh +++ b/install-open-eid.sh @@ -150,10 +150,13 @@ case $distro in ;; esac ;; - ubuntu|neon|zorin|tuxedo) + ubuntu|neon|zorin|tuxedo|pop) case $distro in - neon) - make_warn "Neon is not officially supported; assuming that it is equivalent to Ubuntu" + neon|zorin|tuxedo) + make_warn "$distro is not officially supported; assuming that it is equivalent to Ubuntu" + ;; + pop) + make_warn "Pop!_OS is not officially supported; assuming that it is equivalent to Ubuntu" ;; *) ;; @@ -201,23 +204,6 @@ case $distro in ;; esac ;; - pop) - case $codename in - artful|cosmic|disco|eoan|bionic|focal) - make_fail "Pop!_OS $codename is not officially supported" - ;; - jammy) - make_warn "Pop!_OS $codename is not officially supported" - make_warn "Trying to install packages from Ubuntu $codename repository" - add_repository $codename - ;; - *) - make_warn "Pop!_OS $codename is not officially supported" - make_warn "Trying to install packages from Ubuntu ${LATEST_SUPPORTED_UBUNTU_CODENAME} repository" - add_repository ${LATEST_SUPPORTED_UBUNTU_CODENAME} - ;; - esac - ;; *) make_fail "$distro is not supported :(" ;;