@@ -15,11 +15,11 @@ useExtendedFilename=$1
1515if (( useExtendedFilename == 1 )) ; then
1616 # only use characters supported in most OS!
1717 # for Win see https://learn.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-shares--directories--files--and-metadata
18- FILENAME=" openWB_backup_ $( date +" %Y-%m-%d_%H-%M-%S" ) _$( < " $OPENWBBASEDIR " /web/version) .tar "
18+ FILENAME=" $( date +" %Y-%m-%d_%H-%M-%S" ) _$( < " $OPENWBBASEDIR " /web/version) "
1919else
20- FILENAME=" backup.tar "
20+ FILENAME=" backup"
2121fi
22- FILENAMESUFFIX=" .gz "
22+ FILENAMESUFFIX=" .openwb-backup "
2323
2424# Mosquitto DB files to monitor
2525DB_FILES=(
@@ -206,19 +206,19 @@ wait_for_mosquitto_flush() {
206206 --directory=" $LOGDIR /" \
207207 " backup.log"
208208 echo " zipping archive"
209- gzip --verbose " $BACKUPFILE "
209+ gzip --verbose --suffix " $FILENAMESUFFIX " " $BACKUPFILE "
210210
211211
212212 # encrypt backup file with gpg
213213 if [[ -f " $HOMEDIR /$KEYFILE " ]]; then
214214 echo " encrypting backup file"
215215 gpg --batch --yes --passphrase-file " $HOMEDIR /$KEYFILE " \
216- --symmetric --cipher-algo AES256 " $BACKUPFILE .gz"
217- FILENAMESUFFIX=" .gz.gpg"
216+ --symmetric --cipher-algo AES256 " $BACKUPFILE$FILENAMESUFFIX "
218217 echo " removing unencrypted backup file"
219- rm -v " $BACKUPFILE .gz"
218+ rm -v " $BACKUPFILE$FILENAMESUFFIX "
219+ FILENAMESUFFIX=" $FILENAMESUFFIX .gpg"
220220 else
221- echo " ERROR: $BACKUPFILE .gz not found!"
221+ echo " ERROR: $BACKUPFILE$FILENAMESUFFIX not found!"
222222 fi
223223
224224 # fix permissions of backup file
0 commit comments