Browse Source

Merge remote-tracking branch 'refs/remotes/origin/master' into hurt-world

pull/573/head
Daniel Gibbs 9 years ago
parent
commit
12850fd068
  1. 4
      functions/fn_details
  2. 10
      functions/fn_details_distro

4
functions/fn_details

@ -2,7 +2,7 @@
# LGSM fn_details function
# Author: Daniel Gibbs
# Website: http://gameservermanagers.com
lgsm_version="061115"
lgsm_version="211215"
# Description: Displays server infomation.
@ -48,7 +48,7 @@ printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' =
echo -e "\e[34mTotal:\t\e[0m${totalspace}"
echo -e "\e[34mUsed:\t\e[0m${usedspace}"
echo -e "\e[34mAvailable:\t\e[0m${availspace}"
echo -e "\e[34mServerfiles:\t\e[0m${serverfilesdu}"
echo -e "\e[34mServerfiles:\t\e[0m${filesdirdu}"
if [ -d "${backupdir}" ]; then
echo -e "\e[34mBackups:\t\e[0m${backupdirdu}"
fi

10
functions/fn_details_distro

@ -2,7 +2,7 @@
# LGSM fn_details_distro function
# Author: Daniel Gibbs
# Website: http://gameservermanagers.com
lgsm_version="201215"
lgsm_version="211215"
# Description: Variables providing useful info on the Operating System such as disk and performace info.
# Used for fn_details, fn_debug and fn_email.
@ -70,9 +70,9 @@ usedspace=$(df -hP "${rootdir}" | grep -v "Filesystem" | awk '{print $3}')
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"
filesdirdu=$(du -sh "${filesdir}" | awk '{print $1}')
if [ -z ${filesdirdu} ]; then
filesdirdu="0M"
fi
# Backup info
@ -87,7 +87,7 @@ if [ -d "${backupdir}" ]; then
# most recent backup.
lastbackup=$(ls -t "${backupdir}"/*.tar.gz | head -1)
# date of most recent backup.
lastbackupdate=$(date -r ${lastbackup})
lastbackupdate=$(date -r "${lastbackup}")
# size of most recent backup.
lastbackupsize=$(du -h "${lastbackup}" | awk '{print $1}')

Loading…
Cancel
Save