From ce467c91bade32f26e2ea204459728dc69679268 Mon Sep 17 00:00:00 2001 From: IZ7BOJ <38103662+IZ7BOJ@users.noreply.github.com> Date: Thu, 5 Apr 2018 14:46:22 +0200 Subject: [PATCH] Update DMRIDUpdate.sh In case of dmr-marc.net server unresponsive, DMRIDs.dat is not overwritten with an empty file. --- linux/DMRIDUpdate.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/linux/DMRIDUpdate.sh b/linux/DMRIDUpdate.sh index eac4177..3dd8a8f 100755 --- a/linux/DMRIDUpdate.sh +++ b/linux/DMRIDUpdate.sh @@ -48,8 +48,9 @@ # # CONFIGURATION # -# Full path to DMR ID file -DMRIDFILE=/path/to/DMR/ID/file/DMRIds.dat +# Full path to DMR ID file, without final slash +DMRIDPATH=/path/to/DMR/ID/file +DMRIDFILE=${DMRIDPATH}/DMRIds.dat # # How many DMR ID files do you want backed up (0 = do not keep backups) DMRFILEBACKUP=1 @@ -90,7 +91,14 @@ then fi # Generate new file -curl 'http://dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=users&format=csv&header=0' 2>/dev/null | sed -e 's/\t//g' | awk -F"," '/,/{gsub(/ /, "", $2); printf "%s\t%s\t%s\n", $1, $2, $3}' | sed -e 's/\(.\) .*/\1/g' > ${DMRIDFILE} +curl 'http://dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?table=users&format=csv&header=0' 2>/dev/null | sed -e 's/\t//g' | awk -F"," '/,/{gsub(/ /, "", $2); printf "%s\t%s\t%s\n", $1, $2, $3}' | sed -e 's/\(.\) .*/\1/g' > ${DMRIDPATH}/DMRIds.tmp +if [ -s ${DMRIDPATH}/DMRIds.tmp ] +then + mv ${DMRIDPATH}/DMRIds.tmp ${DMRIDFILE} +else + echo " ERROR during file update " + rm ${DMRIDPATH}/DMRIds.tmp +fi # Restart MMDVMHost eval ${RESTARTCOMMAND}