diff --git a/public/detect_linux.sh b/public/detect_linux.sh index 8b923f9..0e6fe5e 100644 --- a/public/detect_linux.sh +++ b/public/detect_linux.sh @@ -63,31 +63,35 @@ elif [ -f /etc/debian_version ]; then resetDistVer fi fi -elif [ -f /etc/os-release ]; then - . /etc/os-release - if [ "$ID" == "arch" ]; then - DISTNAME=arch - elif [ "$ID" == "antergos" ] || [ "$ID" == "manjaro" ]; then - DISTNAME=ubuntu - DISTVER=18.10 - elif [ "$ID" == "opensuse-leap" ]; then - if [ "$VERSION_ID" == "15.0" ]; then - DISTNAME=opensuse - DISTVER=15 - elif [ "$VERSION_ID" == "15.1" ]; then - DISTNAME=opensuse - DISTVER=15.1 +fi + +if [ "$DISTNAME" == "unknown" ]; then + if [ -f /etc/os-release ]; then + . /etc/os-release + if [ "$ID" == "arch" ]; then + DISTNAME=arch + elif [ "$ID" == "antergos" ] || [ "$ID" == "manjaro" ]; then + DISTNAME=ubuntu + DISTVER=18.10 + elif [ "$ID" == "opensuse-leap" ]; then + if [ "$VERSION_ID" == "15.0" ]; then + DISTNAME=opensuse + DISTVER=15 + elif [ "$VERSION_ID" == "15.1" ]; then + DISTNAME=opensuse + DISTVER=15.1 + else + resetDistVer + fi + elif [ "$ID" == "opensuse-tumbleweed" ]; then + DISTNAME=tumbleweed + DISTVER= else resetDistVer fi - elif [ "$ID" == "opensuse-tumbleweed" ]; then - DISTNAME=tumbleweed - DISTVER= else resetDistVer fi -else - resetDistVer fi -echo ${DISTNAME}${DISTVER} +echo ${DISTNAME}${DISTVER} \ No newline at end of file