Skip to content

D
devcontainer-features
Commit ba5967b1 authored by Josh Spicer's avatar Josh Spicer Committed by GitHub
Browse files
Options

Merge branch 'main' of https://github.com/devcontainers/features

parents 8fa5b691 62086e33
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
src/anaconda/install.sh
View file @ ba5967b1
...@@ -28,7 +28,7 @@ rm -f /etc/profile.d/00-restore-env.sh ...@@ -28,7 +28,7 @@ rm -f /etc/profile.d/00-restore-env.sh
echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
chmod +x /etc/profile.d/00-restore-env.sh chmod +x /etc/profile.d/00-restore-env.sh
# If in automatic mode, determine if a user already exists, if not use vscode # Determine the appropriate non-root user
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
USERNAME="" USERNAME=""
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
...@@ -39,12 +39,10 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then ...@@ -39,12 +39,10 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
fi fi
done done
if [ "${USERNAME}" = "" ]; then if [ "${USERNAME}" = "" ]; then
USERNAME=vscode USERNAME=root
fi fi
elif [ "${USERNAME}" = "none" ]; then elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
USERNAME=root USERNAME=root
USER_UID=0
USER_GID=0
fi fi
architecture="$(uname -m)" architecture="$(uname -m)"
......
src/hugo/install.sh
View file @ ba5967b1
...@@ -27,7 +27,7 @@ rm -f /etc/profile.d/00-restore-env.sh ...@@ -27,7 +27,7 @@ rm -f /etc/profile.d/00-restore-env.sh
echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
chmod +x /etc/profile.d/00-restore-env.sh chmod +x /etc/profile.d/00-restore-env.sh
# If in automatic mode, determine if a user already exists, if not use vscode # Determine the appropriate non-root user
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
USERNAME="" USERNAME=""
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
...@@ -38,12 +38,10 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then ...@@ -38,12 +38,10 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
fi fi
done done
if [ "${USERNAME}" = "" ]; then if [ "${USERNAME}" = "" ]; then
USERNAME=vscode USERNAME=root
fi fi
elif [ "${USERNAME}" = "none" ]; then elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
USERNAME=root USERNAME=root
USER_UID=0
USER_GID=0
fi fi
architecture="$(uname -m)" architecture="$(uname -m)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment