Update pibackup.sh

pibackup.sh

@@ -2,47 +2,45 @@
 
 source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc
-source /opt/idssys/settings/nodemgmt.conf
-source /opt/idssys/nodemgmt/defaults.inc
+source /opt/idssys/pibackup/settings.inc
 
-MountPoint="/mnt/urbackup-backup"
+MountPoint="/mnt/urbackup-backup-test"
 ServerName="//ids-veeam.scity.us/PiBackups"
-UserName="pibackups"
-Password="pibackups"
+UserName="pibackup"
+Password="P1backup"
+
+if		[ -f /dev/nvme0n1 ];	then $dtype=/dev/nvme0n1
+elif	[ -f /dev/mmcblk0 ];	then $dtype=/dev/mmcblk0
+fi
 
-hname="OctoPi"
 BackupDir="${MountPoint}/${hname}"
 
-
-# Check for backup directory, if not found create it #
-directory_check () {
-	echo "Checking for "$BackupDir" and creating if missing"
-	[ ! -d "$BackupDir" ] && mkdir -p "$BackupDir"
-}
+[ ! -d "$MountPoint" ] && mkdir -p "$MountPoint"
 
 mount.cifs ${ServerName} ${MountPoint} -o user=${UserName},password=${Password}
 
-directory_check
+[ ! -d "$BackupDir" ] && mkdir -p "$BackupDir"
+
 
 echo "Starting Backup"
-dd if=/dev/mmcblk0 of=${BackupDir}/$(date +%Y-%m-%d).img bs=1M status=progress
+#dd if=${dtype} of=${BackupDir}/$(date +%Y-%m-%d).img bs=1M status=progress
 echo "Backup Complete"
 
 echo "Starting PiShrink"
-source /usr/local/bin/pishrink.sh ${BackupDir}/$(date +%Y-%m-%d).img
+#source /opt/idssys/pibackup/pishrink.sh ${BackupDir}/$(date +%Y-%m-%d).img
 
 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
+# 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