From 09c97be831cccb84a133b603e662a60a04191279 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 15 Jan 2015 15:06:38 +0000
Subject: [PATCH] Added new function fn_distrodetails

fn_distrodetails to replace 3  functions and provide more in depth info
for fn_details and other functions that require distro and game server
info.

fn_load, fn_uptime and fn_distro are being depricated
---
 functions/fn_distro        |  3 +-
 functions/fn_distrodetails | 81 ++++++++++++++++++++++++++++++++++++++
 functions/fn_functions     |  9 ++++-
 functions/fn_load          |  3 +-
 functions/fn_uptime        |  3 +-
 5 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 functions/fn_distrodetails

diff --git a/functions/fn_distro b/functions/fn_distro
index 51a47378c..0e557e2dd 100644
--- a/functions/fn_distro
+++ b/functions/fn_distro
@@ -2,7 +2,8 @@
 # LGSM fn_distro function
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 011214
+# Version: 141214
+# Depricated: fn_distrodetails has replaced this function.
 
 arch=$(uname -m)
 kernel=$(uname -r)
diff --git a/functions/fn_distrodetails b/functions/fn_distrodetails
new file mode 100644
index 000000000..486bc5e7e
--- /dev/null
+++ b/functions/fn_distrodetails
@@ -0,0 +1,81 @@
+#!/bin/bash
+# LGSM fn_distrodetails function
+# Author: Daniel Gibbs
+# Website: http://danielgibbs.co.uk
+# Version: 141214
+
+# Description: Variables providing useful info on the Operating System such as disk and performace info.
+# Used for fn_details, fn_debugserver and fn_emailnotification.
+
+# Distro infomation
+# Returns architecture, kernel and distro/os
+arch=$(uname -m)
+kernel=$(uname -r)
+if [ -f /etc/lsb-release ]; then
+	os=$(lsb_release -s -d)
+elif [ -f /etc/debian_version ]; then
+	os="Debian $(cat /etc/debian_version)"
+elif [ -f /etc/redhat-release ]; then
+	os=$(cat /etc/redhat-release)
+else
+	os="$(uname -s) $(uname -r)"
+fi
+
+# Glibc version number
+# e.g: 1.17
+glibcv=$(ldd --version |grep ldd|awk '{print $NF}')
+
+# tmux version
+# e.g: tmux 1.6
+if [ "$(tmux -V|sed "s/tmux //"|sed -n '1 p'|tr -cd [:digit:]|tail -c 3)" -lt "16" ]; then
+	tmuxv="$(tmux -V) (>= 1.6 required for console log)"
+else
+	tmuxv=$(tmux -V)
+fi
+
+# Performance
+
+# Average server load
+load=$(uptime|awk -F 'load average: ' '{ print $2 }')
+
+# Memory
+physmemtotal=$(free -h|grep "Mem:" | awk '{print $2}')
+physmemused=$(free -h|grep "Mem:" | awk '{print $3}')
+physmemfree=$(free -h|grep "Mem:" | awk '{print $4}')
+swaptotal=$(free -h|grep "Swap:" | awk '{print $2}')
+swapused=$(free -h|grep "Swap:" | awk '{print $3}')
+swapfree=$(free -h|grep "Swap:" | awk '{print $4}')
+
+# Uptime
+uptime=$(</proc/uptime)
+uptime=${uptime%%.*}
+minutes=$(( uptime/60%60 ))
+hours=$(( uptime/60/60%24 ))
+days=$(( uptime/60/60/24 ))
+
+# Disk usage
+# available space on the partition
+availspace=$(df -hP ${rootdir} | grep -v "Filesystem" | awk '{print $4}')
+# used space in serverfiles dir
+serverfilesdu=$(du -sh ${serverfiles} | awk '{print $1}')
+if [ -z ${serverfilesdu} ]; then
+	serverfilesdu="0M"
+fi
+
+# Backup info
+if [ -d "${backupdir}" ]; then
+	# used space in backups dir
+	backupdirdu=$(du -sh ${backupdir} | awk '{print $1}')
+	if [ -z ${backupdirdu} ]; then
+		backupdirdu="0M"
+	fi
+	# number of backups
+	backupcount=$(find "${backupdir}"/*.tar.gz | wc -l)
+	# most recent backup
+	lastbackup=$(ls -t "${backupdir}"/*.tar.gz | head -1)
+	# date of most recent backup
+	lastbackupdate=$(date -r ${lastbackup})
+	# size of most recent backup
+	lastbackupsize=$(du -h "${lastbackup}" | awk '{print $1}')
+
+fi
\ No newline at end of file
diff --git a/functions/fn_functions b/functions/fn_functions
index 1aa2d0ae5..32ff68777 100644
--- a/functions/fn_functions
+++ b/functions/fn_functions
@@ -2,7 +2,7 @@
 # LGSM fn_functions function
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 040115
+# Version: 150115
 
 # Description: Defines all functions to allow download and execution of functions using fn_runfunction.
 # This function is called first before any other function. Without this file other functions would not load.
@@ -32,11 +32,16 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
+# Depricated: fn_distrodetails has replaced this function.
 fn_distro(){
 functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
+fn_distrodetails(){
+functionfile="${FUNCNAME}"
+fn_runfunction
+}
 fn_emailnotification(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -47,6 +52,7 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
+# Depricated: fn_distrodetails has replaced this function.
 fn_load(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -119,6 +125,7 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
+# Depricated: fn_distrodetails has replaced this function.
 fn_uptime(){
 functionfile="${FUNCNAME}"
 fn_runfunction
diff --git a/functions/fn_load b/functions/fn_load
index 4b2048316..c8745766d 100644
--- a/functions/fn_load
+++ b/functions/fn_load
@@ -2,6 +2,7 @@
 # LGSM fn_load function
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 011214
+# Version: 141214
+# Depricated: fn_distrodetails has replaced this function.
 
 load=$(uptime|awk -F 'load average' '{ print $2 }')
\ No newline at end of file
diff --git a/functions/fn_uptime b/functions/fn_uptime
index 4966e285e..3414da3a4 100644
--- a/functions/fn_uptime
+++ b/functions/fn_uptime
@@ -2,7 +2,8 @@
 # LGSM fn_uptime function
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 011214
+# Version: 141214
+# Depricated: fn_distrodetails has replaced this function.
 
 uptime=$(</proc/uptime)
 uptime=${uptime%%.*}