Trying to fix issue of deleting vscode user. Updating to version 2.0.52

entrypoint.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
 set -eu
 
-if [[ -z "${HOME_USER}" ]]; then
+if [[ -z "${HOME_USER-}" ]]; then
     HOME_USER="vscode"
 fi
 
-#addgroup nonroot
-#adduser --disabled-password --gecos "" ${HOME_USER}
-#echo "${HOME_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
 # We do this first to ensure sudo works below when renaming the user.
 # Otherwise the current container UID may not exist in the passwd database.
 eval "$(fixuid -q)"
@@ -36,22 +32,38 @@ if [ "${HOME_USER-}" ]; then
     env | grep -v 'HOME_USER' | while read -r line; do
       sudo su - ${HOME_USER} -c "echo 'export $line' >> ~/.bashrc"
     done
-    
-    # Changing the property of the directory /home/${HOME_USER}
-    sudo chown -R ${HOME_USER}: /home/${HOME_USER}/
+
+    # Copy the .bashrc file from vscode user to HOME_USER
+    sudo su - ${HOME_USER} -c "cat /home/vscode/.bashrc >> ~/.bashrc"
+
+    # Creating .vscode folder if it doesn't exist
+    if [ ! -d "/home/${HOME_USER}/.vscode" ]; then
+      sudo mkdir -p /home/${HOME_USER}/.vscode
+    fi
+
+    # Changing the property of the directory /home/${HOME_USER}/.vscode
+    sudo chown -R ${HOME_USER}: /home/${HOME_USER}/.vscode
     
     # Changing the HOME_USER in the .bashrc file
-    sudo su - ${HOME_USER} -c 'sed -i "s|/home/vscode|/home/${HOME_USER}|g" ~/.bashrc'
+    sudo su - ${HOME_USER} -c "sudo sed -i \"s|/home/vscode|/home/${HOME_USER}|g\" ~/.bashrc"
 
-    sudo -u $HOME_USER -i
-    # Unfortunately we cannot change $HOME as we cannot move any bind mounts
-    # nor can we bind mount $HOME into a new home as that requires a privileged container.
-    # sudo usermod --login "$HOME_USER" vscode
-    # sudo groupmod -n "$HOME_USER" vscode
+    # Switch to the user specified by $HOME_USER and start an interactive shell session.
+    sudo su -l ${HOME_USER}
 
-    # sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd
-    # sudo cd /home/${HOME_USER}
-    sudo chown -R ${HOME_USER}:${HOME_USER} /home/${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
+    if id "vscode" &>/dev/null; then
+      sudo chown -R vscode:vscode /home/vscode
+      sudo -u ${HOME_USER} bash -c '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.32
+2.0.52