Merge pull request #697 from github/djdefi-os-release

Use os-release for host info

Author: djdefi

bin/ghe-backup

@@ -231,9 +231,11 @@ fi
 
 # Output system information of the backup host
 
-# If /etc/issue.net exists, use it to get the OS version
-if [ -f /etc/issue.net ]; then
-  echo "Running on: $(cat /etc/issue.net)"
+# If /etc/os-release exists, use it to get the OS version
+if [ -f /etc/os-release ]; then
+  OS_NAME=$(grep '^NAME' /etc/os-release | cut -d'"' -f2)
+  VERSION_ID=$(grep '^VERSION_ID' /etc/os-release | cut -d'"' -f2)
+  echo "Running on: $OS_NAME $VERSION_ID"
 else
   echo "Running on: Unknown OS"
 fi

test/test-ghe-backup.sh

@@ -1068,7 +1068,9 @@ begin_test "ghe-backup collects information on system where backup-utils is inst
   set -e
 
   output=$(ghe-backup)
-  echo "$output" | grep "Running on: $(cat /etc/issue.net)"
+  OS_NAME=$(grep '^NAME' /etc/os-release | cut -d'"' -f2)
+  VERSION_ID=$(grep '^VERSION_ID' /etc/os-release | cut -d'"' -f2)
+  echo "$output" | grep "Running on: $OS_NAME $VERSION_ID"
   echo "$output" | grep "CPUs: $(nproc)"
   echo "$output" | grep "Memory total/used/free+share/buff/cache:"
 
@@ -1088,4 +1090,4 @@ begin_test "ghe-backup manages progress tracking files properly"
   echo "$output" | grep -v "mkdir: cannot create directory /tmp/backup-utils-progress: File exists"  
 
 )
-end_test
+end_test