Fix script_name

openspace42 · Jun 3, 2018 · 9aacf0f · 9aacf0f
1 parent f7fda95
commit 9aacf0f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/functions/backup_restore b/functions/backup_restore
@@ -167,7 +167,7 @@ os-br_create_dirs() {
 
 		mkdir -p "$backup_local_storage_path/archive"
 		mkdir -p "$backup_local_storage_path/latest"
-		backup_name=$scriptname-$now
+		backup_name=$script_name-$now
 		tmp_backup_dir="$backup_local_storage_path/temp/$backup_name"
 		mkdir -p "$tmp_backup_dir"
 
@@ -664,7 +664,7 @@ os-br_duplicity_loop() {
 			BACKUPSTATUS=$(cat "$DAILYLOGFILE" | grep -i error | wc -l)
 			if [ "$BACKUPSTATUS" != "0" ]
 			then
-				cat "$DAILYLOGFILE" | mail -aFrom:"$scriptname@$HOST" -s "ERROR in $scriptname backup for $HOST on $DATE" $MAILADDR
+				cat "$DAILYLOGFILE" | mail -aFrom:"$script_name@$HOST" -s "ERROR in $script_name backup for $HOST on $DATE" $MAILADDR
 			elif [ "$FULL" = "full" ]
 			then
 				echo "$(date +%d%m%Y_%T) Full Back Done" >> $FULLBACKLOGFILE

diff --git a/functions/check_install_version b/functions/check_install_version
@@ -213,7 +213,6 @@ os-check_install_version() {
                     echo "${g}${b}Backup complete. Continuing installation...${x}"
                     echo
                 else
-                    echo
                     echo "${r}${b}Backup failed. It's likely that by completing this installation the backup functionality will be restored, but proceed at your own risk.${x}"
                     echo
                     read -rp "${b}Continue anyway even without a backup? (Y/n): ${x}" -n 1