detect_linux.sh edited online with Bitbucket

public/detect_linux.sh

@@ -63,31 +63,35 @@ elif [ -f /etc/debian_version ]; then
       resetDistVer
     fi
   fi
-elif [ -f /etc/os-release ]; then
+fi  
-  . /etc/os-release
+
-  if [ "$ID" == "arch" ]; then
+if [ "$DISTNAME" == "unknown" ]; then
-    DISTNAME=arch
+  if [ -f /etc/os-release ]; then
-  elif [ "$ID" == "antergos" ] || [ "$ID" == "manjaro" ]; then
+    . /etc/os-release
-    DISTNAME=ubuntu
+    if [ "$ID" == "arch" ]; then
-    DISTVER=18.10
+      DISTNAME=arch
-  elif [ "$ID" == "opensuse-leap" ]; then
+    elif [ "$ID" == "antergos" ] || [ "$ID" == "manjaro" ]; then
-    if [ "$VERSION_ID" == "15.0" ]; then
+      DISTNAME=ubuntu
-      DISTNAME=opensuse
+      DISTVER=18.10
-      DISTVER=15
+    elif [ "$ID" == "opensuse-leap" ]; then
-    elif [ "$VERSION_ID" == "15.1" ]; then
+      if [ "$VERSION_ID" == "15.0" ]; then
-      DISTNAME=opensuse
+        DISTNAME=opensuse
-      DISTVER=15.1
+        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}