Update script execution in entrypoint.sh and bump version to 3.0.26

entrypoint.sh

@@ -16,7 +16,7 @@ if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
 fi
 
 # List all environment variables
-sudo env |
+printenv |
 
 # Filter variables that start with GLOBAL_ENV_
 grep -E '^GLOBAL_ENV_' |
@@ -31,38 +31,32 @@ sed 's/^GLOBAL_ENV_//' |
 while IFS= read -r line
 do
   if ! grep -q "^${line%=*}=" /etc/environment; then
-    echo "export $line" | sudo tee -a /etc/environment
+    echo "" >> /etc/environment
+    echo "export $line" >> /etc/environment
   fi
 done
 
+# List all environment variables
+printenv |
+
+# Filter variables that start with USER_ENV_
+grep -E '^USER_ENV_' |
+
+# Remove the USER_ENV_ prefix
+sed 's/^USER_ENV_//' |
+
+# Append the result to /usr/bin/.bashrc
+while IFS= read -r line
+do
+  echo "" >> /usr/bin/.bashrc
+  echo "export $line" >> /usr/bin/.bashrc
+done
+
 USER="$HOME_USER"
 if ! id -u $HOME_USER > /dev/null 2>&1; then
   sudo adduser --disabled-password --gecos "" --uid 1000 ${HOME_USER}
   sudo echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
 
-  # Check if the .bashrc file exists, if not, create it
-  #if [ ! -f /home/${HOME_USER}/.bashrc ]; then
-    #sudo touch /home/${HOME_USER}/.bashrc
-  #fi
-
-  # Change the ownership of the .bashrc file
-  #sudo chown ${HOME_USER} /home/${HOME_USER}/.bashrc
-
-  # List all environment variables
-  #sudo env |
-
-  # Filter variables that start with USER_ENV_
-  #grep -E '^USER_ENV_' |
-
-  # Remove the USER_ENV_ prefix
-  #sed 's/^USER_ENV_//' |
-
-  # Append the result to /home/${HOME_USER}/.bashrc
-  #while IFS= read -r line
-  #do
-    #echo "export $line" | sudo -u ${HOME_USER} tee -a /home/${HOME_USER}/.bashrc
-  #done
-
   # Creating .vscode folder if it doesn't exist
   if [ ! -d "/home/${HOME_USER}/.vscode" ]; then
     sudo mkdir -p /home/${HOME_USER}/.vscode
@@ -76,13 +70,13 @@ fi
 if [ "$HOME_USER" != "$(whoami)" ]; then
   exec sudo -u $HOME_USER bash -c "source /etc/environment; /usr/bin/entrypoint.sh"
 else
-  sudo chown -R 1000 /home/${HOME_USER}
+  sudo chown -R ${HOME_USER} /home/${HOME_USER}
 fi
 
 # Find .sh files in /usr/bin/custom-scripts and execute them in order
 for script in $(find /usr/bin/custom-scripts -name "*.sh" | sort); do
   chmod +x $script
-  sudo -u $HOME_USER bash -c "source /etc/environment; $script"
+  sudo -u $HOME_USER bash -c "source /etc/environment; sudo $script"
 done
 
 # Move the .bashrc file to the user's home directory

version.txt

@@ -1 +1 @@
-3.0.20
+3.0.26