Merge pull request #52 from ChuckPa/chuckpa/qnap-df-posix

QNAP:  Force POSIX mode 'df' output formatting
This commit is contained in:
Chuck 2023-03-29 02:19:29 -04:00 committed by GitHub
commit 6043ac44c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,12 +2,12 @@
######################################################################### #########################################################################
# Plex Media Server database check and repair utility script. # # Plex Media Server database check and repair utility script. #
# Maintainer: ChuckPa # # Maintainer: ChuckPa #
# Version: v1.0.2 # # Version: v1.0.3 #
# Date: 27-Mar-2023 # # Date: 27-Mar-2023 #
######################################################################### #########################################################################
# Version for display purposes # Version for display purposes
Version="v1.0.2" Version="v1.0.3"
# Flag when temp files are to be retained # Flag when temp files are to be retained
Retain=0 Retain=0
@ -193,7 +193,7 @@ FreeSpaceAvailable() {
[ "$1" != "" ] && Multiplier=$1 [ "$1" != "" ] && Multiplier=$1
# Available space where DB resides # Available space where DB resides
SpaceAvailable=$(df -m "$AppSuppDir" | tail -1 | awk '{print $4}') SpaceAvailable=$(df $DFFLAGS "$AppSuppDir" | tail -1 | awk '{print $4}')
# Get size of DB and blobs, Minimally needing sum of both # Get size of DB and blobs, Minimally needing sum of both
LibSize="$(stat $STATFMT $STATBYTES "$CPPL.db")" LibSize="$(stat $STATFMT $STATBYTES "$CPPL.db")"
@ -303,6 +303,9 @@ HostConfig() {
STATBYTES="%s" STATBYTES="%s"
STATPERMS="%a" STATPERMS="%a"
# On all hosts except QNAP
DFFLAGS="-m"
# Synology (DSM 7) # Synology (DSM 7)
if [ -d /var/packages/PlexMediaServer ] && \ if [ -d /var/packages/PlexMediaServer ] && \
[ -d "/var/packages/PlexMediaServer/shares/PlexMediaServer/AppData/Plex Media Server" ]; then [ -d "/var/packages/PlexMediaServer/shares/PlexMediaServer/AppData/Plex Media Server" ]; then
@ -378,6 +381,9 @@ HostConfig() {
StopCommand="/etc/init.d/plex.sh stop" StopCommand="/etc/init.d/plex.sh stop"
fi fi
# Use custom DFFLAGS (force POSIX mode)
DFFLAGS="-Pm"
HostType="QNAP" HostType="QNAP"
return 0 return 0