From 30e36992aad6bdab7e2defe530d576da96e10d27 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 29 May 2022 17:09:24 -0500
Subject: [PATCH] Update pibackup.sh

---
 pibackup.sh | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/pibackup.sh b/pibackup.sh
index 881c181..589760e 100755
--- a/pibackup.sh
+++ b/pibackup.sh
@@ -15,35 +15,33 @@ if grep '/dev/nvme0n1' /etc/mtab > /dev/null 2>&1; then dtype=/dev/nvme0n1
 elif grep '/dev/mmcblk0' /etc/mtab > /dev/null 2>&1; then dtype=/dev/mmcblk0
 fi
 
-echo "HERE: $dtype"
+BackupDir="${MountPoint}/${hostname}"
 
-# BackupDir="${MountPoint}/${hostname}"
-#
-# [ ! -d "$MountPoint" ] && mkdir -p "$MountPoint"
-#
-# mount.cifs ${ServerName} ${MountPoint} -o user=${UserName},password=${Password}
-#
-# [ ! -d "$BackupDir" ] && mkdir -p "$BackupDir"
-#
-# echo "Starting Backup"
-# dd if=${dtype} of=${BackupDir}/$(date +%Y-%m-%d).img bs=1M status=progress
-# echo "Backup Complete"
-#
-# echo "Starting PiShrink"
-# source /opt/idssys/pibackup/pishrink.sh ${BackupDir}/$(date +%Y-%m-%d).img
-#
-# echo
-# echo "PiShrink complete dismounting share"
-# umount ${MountPoint}
-#
-# allfiles=`ls -1 ${BackupDir}`
-# files=(`ls -1 ${BackupDir} | tail -3`)
-# for i in $allfiles; do keep=0;
-# 	for a in ${files[@]}; do
-# 		if [ $i == $a ]; then keep=1;fi;
-# 	done;
-# 	if [ $keep == 0 ]; then rm -rf ${BackupDir}/$i; fi;
-# done
+[ ! -d "$MountPoint" ] && mkdir -p "$MountPoint"
+
+mount.cifs ${ServerName} ${MountPoint} -o user=${UserName},password=${Password}
+
+[ ! -d "$BackupDir" ] && mkdir -p "$BackupDir"
+
+echo "Starting Backup"
+dd if=${dtype} of=${BackupDir}/$(date +%Y-%m-%d).img bs=1M status=progress
+echo "Backup Complete"
+
+echo "Starting PiShrink"
+source /opt/idssys/pibackup/pishrink.sh ${BackupDir}/$(date +%Y-%m-%d).img
+
+echo
+echo "PiShrink complete dismounting share"
+umount ${MountPoint}
+
+allfiles=`ls -1 ${BackupDir}`
+files=(`ls -1 ${BackupDir} | tail -3`)
+for i in $allfiles; do keep=0;
+	for a in ${files[@]}; do
+		if [ $i == $a ]; then keep=1;fi;
+	done;
+	if [ $keep == 0 ]; then rm -rf ${BackupDir}/$i; fi;
+done
 
 exit 0