From fa07406f4dccd482284cb9d8dbaca6533116dab8 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 13 Jun 2022 13:30:57 -0700
Subject: add missing user groups to fix permission issues for non root user
 (#45)

* add missing user groups

* fix username

* move chmod: anaconda
---
 src/anaconda/install.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/anaconda')

diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 272ba73..c9661d3 100644
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -9,7 +9,6 @@
 
 
 VERSION=${VERSION:-"latest"}
-
 USERNAME=${USERNAME:-"automatic"}
 UPDATE_RC=${UPDATE_RC:-"true"}
 CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"}
@@ -32,8 +31,8 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
     USERNAME=""
     POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
     for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
+        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
+            USERNAME="${CURRENT_USER}"
             break
         fi
     done
@@ -72,11 +71,19 @@ check_packages() {
 
 # Install Conda if it's missing
 if ! conda --version &> /dev/null ; then
+    if ! cat /etc/group | grep -e "^conda:" > /dev/null 2>&1; then
+        groupadd -r conda
+    fi
+    usermod -a -G conda "${USERNAME}"
+
     # Install dependencies
     check_packages wget ca-certificates
 
     mkdir -p $CONDA_DIR
-    chown ${USERNAME}:root $CONDA_DIR
+    chown -R :conda "${CONDA_DIR}"
+    chmod -R g+r+w "${CONDA_DIR}"
+    
+    find "${CONDA_DIR}" -type d | xargs -n 1 chmod g+s
     echo "Installing Anaconda..."
 
     CONDA_VERSION=$VERSION
-- 
cgit v1.2.3