From 7111cb5d7b3451b76b9af471028b2426e1009bf2 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Mon, 25 Oct 2021 13:23:43 +0100 Subject: [PATCH] Fix Linux Mint and NixOS argument parsing --- quickget | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/quickget b/quickget index 64cd3ed..29aad13 100755 --- a/quickget +++ b/quickget @@ -959,9 +959,9 @@ if [ -n "${2}" ]; then get_fedora elif [ "${OS}" == "kali" ]; then get_kali - elif [[ "${OS}" == *"linuxmint"* ]]; then + elif [[ "${OS}" == *"linuxmint-"* ]]; then get_linuxmint - elif [[ "${OS}" == *"nixos"* ]]; then + elif [[ "${OS}" == *"nixos-"* ]]; then get_nixos elif [ "${OS}" == "openbsd" ]; then get_openbsd @@ -1005,7 +1005,7 @@ if [ -n "${2}" ]; then exit 1 fi else - echo "ERROR! You must specify a release for ${OS}:" + echo -n "ERROR! You must specify a release: " if [ "${OS}" == "elementary" ]; then releases_elementary elif [ "${OS}" == "freebsd" ]; then @@ -1014,9 +1014,9 @@ else releases_fedora elif [ "${OS}" == "kali" ]; then releases_kali - elif [[ "${OS}" == *"linuxmint"* ]]; then + elif [[ "${OS}" == *"linuxmint-"* ]]; then releases_linuxmint - elif [[ "${OS}" == *"nixos"* ]]; then + elif [[ "${OS}" == *"nixos-"* ]]; then releases_nixos elif [ "${OS}" == "opensuse" ]; then releases_opensuse @@ -1030,6 +1030,9 @@ else releases_ubuntu elif [ "${OS}" == "windows" ]; then releases_windows + else + echo "${OS} is unknown" + os_support fi exit 1 fi