backup.sh: litt mer beskrivende navn for et par variabler

backup.sh

@@ -50,28 +50,27 @@ echo "PVV; hjemmelaget backupscript (\$ git commit sha: $(cd /backupz && git rev
 echo
 date
 
-
 # Blir brukt som navn på ZFS-snapshot og logger.
-declare -r snapshot="$(date +%Y%m%d)"
+declare -r snapshot_date="$(date +%Y%m%d)"
 if [ "$1" = "full" ]; then # Fullbackupen starter før midnatt, legg på en dag
-	declare -r snapshot=$(date -v +1d +%Y%m%d)
+	declare -r snapshot_date=$(date -v +1d +%Y%m%d)
 fi
 
 declare -r lockfile="/backupz/backup.sh.lock"
 
 if [ -e $lockfile ]; then
-	declare -r pid="$(cat $lockfile)"
+	declare -r existing_pid="$(cat $lockfile)"
 
 	# TODO: Bruk bedre metode for å finne prosess.
-	if ps -p "$pid"; then
-		echo "Backup kjører allerede: $pid"
+	if ps -p "$existing_pid"; then
+		echo "Backup kjører allerede: $existing_pid"
 		exit 1
 	fi
 
 	echo "Forrige backup ble avbrutt, rydder opp..."
 	rm "$lockfile"
 
-	zfs snapshot -r "principal/backupz@avbrutt_${snapshot}" && \
+	zfs snapshot -r "principal/backupz@avbrutt_${snapshot_date}" && \
 	echo "ZFS-snapshot OK." || echo "ZFS-snapshot FEILET!"
 
 	# TODO: zfs rollback til forrige komplette backup.
@@ -81,7 +80,7 @@ fi
 
 # Fang SIGINT, vi vil rydde opp om vi blir avbrutt.
 on_sigint() {
-  rm $lockfile
+  rm "$lockfile"
   echo 'Avbrutt, sletter låsfil...'
   exit 2
 }
@@ -117,7 +116,7 @@ while [ "$(zfs get -Hp available principal/backupz | cut -f3)" -lt 50000000000 ]
 done
 
 echo "Starter backup..."
-echo "Snapshot ID: $snapshot"
+echo "Snapshot ID: $snapshot_date"
 echo
 echo
 
@@ -296,7 +295,7 @@ for host in "${hosts[@]}"; do
   declare -a command=(
     "$rsync"
     "${rsync_flags[@]}"
-    "--log-file=${logdir}/${host}.log.$snapshot"
+    "--log-file=${logdir}/${host}.log.$snapshot_date"
   )
 
   declare exclude_paths_var="${host}_excludes[@]"
@@ -323,7 +322,7 @@ for host in "${hosts[@]}"; do
   command+=("/backupz/${hosts_output_dir[$host]:-$host}/")
 
   echo "Starter backup for vert: $host"
-  "${command[@]}" >"${logdir}/${host}.out.$snapshot" 2>&1 &
+  "${command[@]}" >"${logdir}/${host}.out.$snapshot_date" 2>&1 &
   venteproc[$!]="$host"
   echo "Startet $!: ${command[*]}"
 done
@@ -360,7 +359,7 @@ touch /backupz/homepvv/export/home
 # Ta et zfs snapshot
 echo "Tar ZFS-snapshot..."
 
-zfs snapshot -r "principal/backupz@${snapshot}" && \
+zfs snapshot -r "principal/backupz@${snapshot_date}" && \
 echo "ZFS-snapshot ferdig." || echo "ZFS-snapshot FEILET!"
 echo
 echo Ledig plass: "$(zfs list -H -o avail principal/backupz)"