Merge pull request #13 from RangerRick/master

fix Ubuntu detection on 18.04
opennms-forge · Jul 12, 2018 · 33e5138 · 33e5138
2 parents 01ab3fa + 0aa42b3
commit 33e5138
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+bootstrap.log
diff --git a/bootstrap-debian-dev.sh b/bootstrap-debian-dev.sh
@@ -34,8 +34,12 @@ usage() {
 
 checkRequirements() {
   # Test if system is supported
-  uname -a | grep -E "${REQUIRED_SYSTEMS}"  1>/dev/null 2>>"${ERROR_LOG}"
-  if [ ! "${?}" -eq 0 ]; then
+  DISTRO_CHECK="$(command -v lsb_release)"
+  if [ -z "$DISTRO_CHECK" ]; then
+    DISTRO_CHECK="$(command -v uname)"
+  fi
+  "$DISTRO_CHECK" -a | grep -E "${REQUIRED_SYSTEMS}"  1>/dev/null 2>>"${ERROR_LOG}"
+  if [ ! "${?}" -eq 0 ] && [ ! -e /etc/debian_version ]; then
     echo ""
     echo "This is system is not a supported Ubuntu or Debian system."
     echo ""

diff --git a/bootstrap-debian.sh b/bootstrap-debian.sh
@@ -34,8 +34,12 @@ usage() {
 
 checkRequirements() {
   # Test if system is supported
-  uname -a | grep -E "${REQUIRED_SYSTEMS}"  1>/dev/null 2>>"${ERROR_LOG}"
-  if [ ! "${?}" -eq 0 ]; then
+  DISTRO_CHECK="$(command -v lsb_release)"
+  if [ -z "$DISTRO_CHECK" ]; then
+    DISTRO_CHECK="$(command -v uname)"
+  fi
+  "$DISTRO_CHECK" -a | grep -E "${REQUIRED_SYSTEMS}"  1>/dev/null 2>>"${ERROR_LOG}"
+  if [ ! "${?}" -eq 0 ] && [ ! -e /etc/debian_version ]; then
     echo ""
     echo "This is system is not a supported Ubuntu or Debian system."
     echo ""