get username with whoami

to be compatible with containers
AlvinSchiller · Oct 15, 2023 · 9ee515e · 9ee515e
1 parent db5ff9b
commit 9ee515e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/scripts/installscripts/buster-install-default-with-autohotspot.sh b/scripts/installscripts/buster-install-default-with-autohotspot.sh
@@ -28,7 +28,7 @@ DATETIME=$(date +"%Y%m%d_%H%M%S")
 SCRIPTNAME="$(basename $0)"
 JOB="${SCRIPTNAME}"
 
-CURRENT_USER="${SUDO_USER:-$USER}"
+CURRENT_USER="${SUDO_USER:-$(whoami)}"
 HOME_DIR=$(getent passwd "$CURRENT_USER" | cut -d: -f6)
 echo "Current User: $CURRENT_USER"
 echo "User home dir: $HOME_DIR"
@@ -97,15 +97,15 @@ checkPrerequisite() {
     #currently the user 'pi' is mandatory
     #https://github.com/MiczFlor/RPi-Jukebox-RFID/issues/1785
     if [ "${CURRENT_USER}" != "pi" ]; then
-        echo 
+        echo
         echo "ERROR: User must be 'pi'!"
         echo "       Other usernames are currently not supported."
         echo "       Please check the wiki for further information"
         exit 2
     fi
 
     if [ "${HOME_DIR}" != "/home/pi" ]; then
-        echo 
+        echo
         echo "ERROR: HomeDir must be '/home/pi'!"
         echo "       Other usernames are currently not supported."
         echo "       Please check the wiki for further information"

diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/buster-install-default.sh
@@ -28,7 +28,7 @@ DATETIME=$(date +"%Y%m%d_%H%M%S")
 SCRIPTNAME="$(basename $0)"
 JOB="${SCRIPTNAME}"
 
-CURRENT_USER="${SUDO_USER:-$USER}"
+CURRENT_USER="${SUDO_USER:-$(whoami)}"
 HOME_DIR=$(getent passwd "$CURRENT_USER" | cut -d: -f6)
 echo "Current User: $CURRENT_USER"
 echo "User home dir: $HOME_DIR"
@@ -97,15 +97,15 @@ checkPrerequisite() {
     #currently the user 'pi' is mandatory
     #https://github.com/MiczFlor/RPi-Jukebox-RFID/issues/1785
     if [ "${CURRENT_USER}" != "pi" ]; then
-        echo 
+        echo
         echo "ERROR: User must be 'pi'!"
         echo "       Other usernames are currently not supported."
         echo "       Please check the wiki for further information"
         exit 2
     fi
 
     if [ "${HOME_DIR}" != "/home/pi" ]; then
-        echo 
+        echo
         echo "ERROR: HomeDir must be '/home/pi'!"
         echo "       Other usernames are currently not supported."
         echo "       Please check the wiki for further information"
@@ -864,7 +864,7 @@ install_main() {
 
         sudo wget -q -O /etc/apt/keyrings/mopidy-archive-keyring.gpg https://apt.mopidy.com/mopidy.gpg
         sudo wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/${OS_CODENAME}.list
-        
+
         ${apt_get} update
         ${apt_get} upgrade
         ${apt_get} install libspotify-dev

diff --git a/scripts/installscripts/tests/test_installation.sh b/scripts/installscripts/tests/test_installation.sh
@@ -7,7 +7,7 @@
 INSTALLATION_EXITCODE="${1:-0}"
 
 PATHDATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-USER_NAME="$USER"
+USER_NAME="$(whoami)"
 HOME_DIR="$HOME"
 
 tests=0