fix: update golden template internal/scripts

Author: spapa013

internal/templates/testdata/golden/startup-scripts.yaml

@@ -37,36 +37,47 @@ data:
     echo "Setting up user: ${DEV_USERNAME}"
     
     # Create/rename group with target GID
-    if id -g ${TARGET_GID} &>/dev/null; then
-        echo "Renaming group ${TARGET_GID} to ${DEV_USERNAME}"
-        groupmod -n ${DEV_USERNAME} $(id -gn ${TARGET_GID})
+    if GROUP_ENTRY="$(getent group "${TARGET_GID}")"; then
+        EXISTING_GROUP_NAME="${GROUP_ENTRY%%:*}"
+        if [ "${EXISTING_GROUP_NAME}" != "${DEV_USERNAME}" ]; then
+            echo "Renaming group ${EXISTING_GROUP_NAME} (GID: ${TARGET_GID}) to ${DEV_USERNAME}"
+            groupmod -n "${DEV_USERNAME}" "${EXISTING_GROUP_NAME}"
+        else
+            echo "Group ${DEV_USERNAME} already exists with GID ${TARGET_GID}"
+        fi
     else
         echo "Adding group ${DEV_USERNAME} with GID ${TARGET_GID}"
-        groupadd -g ${TARGET_GID} ${DEV_USERNAME}
+        groupadd -g "${TARGET_GID}" "${DEV_USERNAME}"
     fi
     
     # Create/rename user with target UID
-    if id -u ${TARGET_UID} &>/dev/null; then
-        echo "Renaming user ${TARGET_UID} to ${DEV_USERNAME}"
-        usermod -l ${DEV_USERNAME} -s /bin/bash -d /home/${DEV_USERNAME} -g ${TARGET_GID} $(id -un ${TARGET_UID})
+    if USER_ENTRY="$(getent passwd "${TARGET_UID}")"; then
+        EXISTING_USER_NAME="${USER_ENTRY%%:*}"
+        if [ "${EXISTING_USER_NAME}" != "${DEV_USERNAME}" ]; then
+            echo "Renaming user ${EXISTING_USER_NAME} (UID: ${TARGET_UID}) to ${DEV_USERNAME}"
+            usermod -l "${DEV_USERNAME}" -s /bin/bash -d "/home/${DEV_USERNAME}" -g "${TARGET_GID}" "${EXISTING_USER_NAME}"
+        else
+            echo "User ${DEV_USERNAME} already exists with UID ${TARGET_UID}; ensuring shell/home/group settings"
+            usermod -s /bin/bash -d "/home/${DEV_USERNAME}" -g "${TARGET_GID}" "${DEV_USERNAME}"
+        fi
     else
         echo "Adding user ${DEV_USERNAME} with UID ${TARGET_UID}"
-        useradd -u ${TARGET_UID} -m -s /bin/bash ${DEV_USERNAME}
+        useradd -u "${TARGET_UID}" -g "${TARGET_GID}" -m -s /bin/bash "${DEV_USERNAME}"
     fi
     
     # Ensure home directory exists and has correct ownership
     mkdir -p "/home/${DEV_USERNAME}"
-    chown ${DEV_USERNAME}:${DEV_USERNAME} "/home/${DEV_USERNAME}"
+    chown "${DEV_USERNAME}:${DEV_USERNAME}" "/home/${DEV_USERNAME}"
     
     echo "Section 2: User management complete"
     
     # === ADMIN PRIVILEGES ===
     echo "Setting up admin privileges for ${DEV_USERNAME}"
-    usermod -aG sudo ${DEV_USERNAME}
+    usermod -aG sudo "${DEV_USERNAME}"
     
     # Configure sudo to not require password
-    echo "${DEV_USERNAME} ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/${DEV_USERNAME}
-    chmod 440 /etc/sudoers.d/${DEV_USERNAME}
+    echo "${DEV_USERNAME} ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/${DEV_USERNAME}"
+    chmod 440 "/etc/sudoers.d/${DEV_USERNAME}"
     
     echo "Section 3: Admin privileges complete"
     
@@ -103,14 +114,24 @@ data:
     " > /home/${DEV_USERNAME}/.ssh/authorized_keys
     chmod 700 /home/${DEV_USERNAME}/.ssh
     chmod 600 /home/${DEV_USERNAME}/.ssh/authorized_keys
-    chown -R ${DEV_USERNAME}:${DEV_USERNAME} /home/${DEV_USERNAME}/.ssh
+    chown -R "${DEV_USERNAME}:${DEV_USERNAME}" "/home/${DEV_USERNAME}/.ssh"
     
     echo "Section 5: SSH server setup complete"
     
     # === PACKAGE INSTALLATION ===
     echo "Installing APT packages: vim curl"
     apt-get install -y vim curl
     
+    # Ensure default venv path exists before Python package installs.
+    # This keeps the default pythonBinPath (/opt/venv/bin) functional on images
+    # that don't pre-create /opt/venv.
+    if [ "${PYTHON_BIN_PATH}" = "/opt/venv/bin" ] && [ ! -x "${PYTHON_PATH}" ]; then
+        echo "Bootstrapping Python virtual environment at /opt/venv"
+        apt-get install -y python3-venv
+        python3 -m venv /opt/venv
+        chown -R "${DEV_USERNAME}:${DEV_USERNAME}" /opt/venv
+    fi
+    
     # Install common python packages from requirements.txt
     if [ -f /scripts/requirements.txt ]; then
         echo "Installing Python packages from requirements.txt"
@@ -122,6 +143,11 @@ data:
     echo "Section 6: Package installation complete"
     
     # === USER ENVIRONMENT SETUP ===
+    # Repair ownership across persisted home content before running user-level setup.
+    # This prevents failures like ".bashrc: Permission denied" when stale files are
+    # carried over from previous runs with mismatched UID/GID ownership.
+    chown -R "${DEV_USERNAME}:${DEV_USERNAME}" "/home/${DEV_USERNAME}"
+    
     # Set up environment for the user
     if [ -f /scripts/setup.sh ]; then
         echo "Running user environment setup script"
@@ -146,8 +172,9 @@ data:
     # === VSCODE CONFIGURATION ===
     
     
-    # Make sure .vscode-server directory is owned by ${DEV_USERNAME}
-    chown -R ${DEV_USERNAME}:${DEV_USERNAME} /home/${DEV_USERNAME}/.vscode-server
+    # Make sure .vscode-server directory exists and is owned by ${DEV_USERNAME}
+    mkdir -p /home/${DEV_USERNAME}/.vscode-server
+    chown -R "${DEV_USERNAME}:${DEV_USERNAME}" "/home/${DEV_USERNAME}/.vscode-server"
     
     echo "Section 8: VSCode configuration complete"
     
@@ -157,6 +184,7 @@ data:
     # === SSH SERVER LAUNCH ===
     echo "Starting SSH server"
     /usr/sbin/sshd -D
+    
   
   # Static utility scripts - included as-is
   run_with_git.sh: |