scripts/installer.sh: handle Zorin OS versions separately from Ubuntu (#19758)
Their version scheme is different, even though the OS is based on Ubuntu. We need to check Zorin's version numbers to pick the right APT_KEY_TYPE. Updates #18925 Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
+11
-1
@@ -55,7 +55,7 @@ main() {
|
|||||||
VERSION_MAJOR="${VERSION_ID:-}"
|
VERSION_MAJOR="${VERSION_ID:-}"
|
||||||
VERSION_MAJOR="${VERSION_MAJOR%%.*}"
|
VERSION_MAJOR="${VERSION_MAJOR%%.*}"
|
||||||
case "$ID" in
|
case "$ID" in
|
||||||
ubuntu|pop|neon|zorin|tuxedo)
|
ubuntu|pop|neon|tuxedo)
|
||||||
OS="ubuntu"
|
OS="ubuntu"
|
||||||
if [ "${UBUNTU_CODENAME:-}" != "" ]; then
|
if [ "${UBUNTU_CODENAME:-}" != "" ]; then
|
||||||
VERSION="$UBUNTU_CODENAME"
|
VERSION="$UBUNTU_CODENAME"
|
||||||
@@ -336,6 +336,16 @@ main() {
|
|||||||
VERSION="$VERSION_MAJOR"
|
VERSION="$VERSION_MAJOR"
|
||||||
PACKAGETYPE="tdnf"
|
PACKAGETYPE="tdnf"
|
||||||
;;
|
;;
|
||||||
|
zorin)
|
||||||
|
OS="ubuntu"
|
||||||
|
VERSION="$UBUNTU_CODENAME"
|
||||||
|
PACKAGETYPE="apt"
|
||||||
|
if [ "$VERSION_MAJOR" -lt 16 ]; then
|
||||||
|
APT_KEY_TYPE="legacy"
|
||||||
|
else
|
||||||
|
APT_KEY_TYPE="keyring"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
steamos)
|
steamos)
|
||||||
echo "To install Tailscale on SteamOS, please follow the instructions here:"
|
echo "To install Tailscale on SteamOS, please follow the instructions here:"
|
||||||
echo "https://github.com/tailscale-dev/deck-tailscale"
|
echo "https://github.com/tailscale-dev/deck-tailscale"
|
||||||
|
|||||||
Reference in New Issue
Block a user