change retrieval of current user (docker runs)

AlvinSchiller · Oct 8, 2023 · 14ce195 · 14ce195
1 parent 57d3179
commit 14ce195
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/installscripts/buster-install-default-with-autohotspot.sh b/scripts/installscripts/buster-install-default-with-autohotspot.sh
@@ -28,8 +28,8 @@ DATETIME=$(date +"%Y%m%d_%H%M%S")
 SCRIPTNAME="$(basename $0)"
 JOB="${SCRIPTNAME}"
 
-CURRENT_USER=$(logname)
-HOME_DIR=$(getent passwd $CURRENT_USER | cut -d: -f6)
+CURRENT_USER="${SUDO_USER:-$USER}"
+HOME_DIR=$(getent passwd "$CURRENT_USER" | cut -d: -f6)
 
 JUKEBOX_HOME_DIR="${HOME_DIR}/RPi-Jukebox-RFID"
 LOGDIR="${HOME_DIR}"/phoniebox_logs

diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/buster-install-default.sh
@@ -28,8 +28,8 @@ DATETIME=$(date +"%Y%m%d_%H%M%S")
 SCRIPTNAME="$(basename $0)"
 JOB="${SCRIPTNAME}"
 
-CURRENT_USER=$(logname)
-HOME_DIR=$(getent passwd $CURRENT_USER | cut -d: -f6)
+CURRENT_USER="${SUDO_USER:-$USER}"
+HOME_DIR=$(getent passwd "$CURRENT_USER" | cut -d: -f6)
 
 JUKEBOX_HOME_DIR="${HOME_DIR}/RPi-Jukebox-RFID"
 LOGDIR="${HOME_DIR}"/phoniebox_logs