Trying to fix missing environment variables for root user. Updating to version 2.0.58

entrypoint.sh

@@ -1,6 +1,14 @@
 #!/bin/bash
 set -eu
 
+# Check if we are root
+if [ "$(id -u)" != "0" ]; then
+   echo "This script must be run as root" 1>&2
+   sudo bash -c "echo HOME_USER=$HOME_USER >> /etc/environment"
+   sudo bash -c "echo VSCODE_TUNNEL_NAME=$VSCODE_TUNNEL_NAME >> /etc/environment"
+   exec sudo bash -c "source /etc/environment; /usr/bin/entrypoint.sh"
+fi
+
 if [[ -z "${HOME_USER-}" ]]; then
     HOME_USER="vscode"
 fi
@@ -11,7 +19,7 @@ eval "$(fixuid -q)"
 
 if [ "${HOME_USER-}" ]; then
   USER="$HOME_USER"
-  if [ "$HOME_USER" != "$(whoami)" ]; then
+  if [[ "${HOME_USER-}" != "vscode" ]]; then
     if ! id -u $HOME_USER > /dev/null 2>&1; then
       sudo adduser --disabled-password --gecos "" ${HOME_USER}
       sudo echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
@@ -50,8 +58,20 @@ if [ "${HOME_USER-}" ]; then
     # Switch to the user specified by $HOME_USER and start an interactive shell session.
     sudo su -l ${HOME_USER}
 
+    # Copy the HOME variable from vscode user to HOME_USER
+    sudo su -l ${HOME_USER} -c "echo \"export HOME=/home/${HOME_USER}\" >> ~/.bashrc"
+
+    # Source the .bashrc file to apply the changes immediately
+    sudo su -l ${HOME_USER} -c "source ~/.bashrc"
+
     # Delete the vscode user
-    sudo userdel vscode
+    if id "vscode" &>/dev/null; then
+      sudo chown -R vscode:vscode /home/vscode
+      sudo userdel -r vscode
+    fi
+  else
+    # Switch to the user specified by $HOME_USER and start an interactive shell session.
+    sudo su -l ${HOME_USER}
   fi
 fi
 

version.txt

@@ -1 +1 @@
-2.0.48
+2.0.58