From 8c51936c1378d23154d6ad4a74814a11d0781ac3 Mon Sep 17 00:00:00 2001
From: Jeremy O'Brien <neutral@fastmail.com>
Date: Fri, 15 Nov 2019 07:55:22 -0500
Subject: [PATCH] fix: don't use $USERNAME as default username for
 backup/restore scripts, as this is usually defined on linux hosts as the
 current logged in user

Signed-off-by: Jeremy O'Brien <neutral@fastmail.com>
---
 scripts/backup.sh  | 6 +++---
 scripts/restore.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/backup.sh b/scripts/backup.sh
index 9c58dbd52..526d5bbdf 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -17,7 +17,7 @@ while getopts "ho:n:u:" arg; do
 			OUTPUT=$OPTARG
 			;;
 		u)
-			USERNAME=$OPTARG
+			UNIT_USERNAME=$OPTARG
 			;;
 		*)
 			usage
@@ -30,7 +30,7 @@ UNIT_HOSTNAME=${UNIT_HOSTNAME:-10.0.0.2}
 # output backup tgz file
 OUTPUT=${OUTPUT:-${UNIT_HOSTNAME}-backup-$(date +%s).tgz}
 # username to use for ssh
-USERNAME=${USERNAME:-pi}
+UNIT_USERNAME=${UNIT_USERNAME:-pi}
 # what to backup
 FILES_TO_BACKUP="/root/brain.nn \
   /root/brain.json \
@@ -54,4 +54,4 @@ ping -c 1 "${UNIT_HOSTNAME}" > /dev/null 2>&1 || {
 }
 
 echo "@ backing up $UNIT_HOSTNAME to $OUTPUT ..."
-ssh "${USERNAME}@${UNIT_HOSTNAME}" "sudo find ${FILES_TO_BACKUP} -print0 | xargs -0 sudo tar cv" | gzip -9 > "$OUTPUT"
+ssh "${UNIT_USERNAME}@${UNIT_HOSTNAME}" "sudo find ${FILES_TO_BACKUP} -print0 | xargs -0 sudo tar cv" | gzip -9 > "$OUTPUT"
diff --git a/scripts/restore.sh b/scripts/restore.sh
index 551094e9c..98ea2192c 100755
--- a/scripts/restore.sh
+++ b/scripts/restore.sh
@@ -17,7 +17,7 @@ while getopts "hb:n:u:" arg; do
 			UNIT_HOSTNAME=$OPTARG
 			;;
 		u)
-			USERNAME=$OPTARG
+			UNIT_USERNAME=$OPTARG
 			;;
 		*)
 			exit 1
@@ -42,7 +42,7 @@ if [ -z $BACKUP ]; then
 	fi
 fi
 # username to use for ssh
-USERNAME=${USERNAME:-pi}
+UNIT_USERNAME=${UNIT_USERNAME:-pi}
 
 ping -c 1 "${UNIT_HOSTNAME}" > /dev/null 2>&1 || {
   echo "@ unit ${UNIT_HOSTNAME} can't be reached, make sure it's connected and a static IP assigned to the USB interface."
@@ -50,4 +50,4 @@ ping -c 1 "${UNIT_HOSTNAME}" > /dev/null 2>&1 || {
 }
 
 echo "@ restoring $BACKUP to $UNIT_HOSTNAME ..."
-cat ${BACKUP} | ssh "${USERNAME}@${UNIT_HOSTNAME}" "sudo tar xzv -C /"
+cat ${BACKUP} | ssh "${UNIT_USERNAME}@${UNIT_HOSTNAME}" "sudo tar xzv -C /"