File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -29,10 +29,10 @@ install_node() {
2929 nvm alias default " $NODE_CHANNEL " || true
3030 nvm use default || true
3131 fi
32- corepack enable || true
32+ corepack enable 2> /dev/null || true
3333 npm install -g npm@latest || true
34- corepack prepare pnpm@latest --activate || true
35- corepack prepare yarn@1 --activate || true
34+ corepack prepare pnpm@latest --activate 2> /dev/null || true
35+ corepack prepare yarn@1 --activate 2> /dev/null || true
3636 npm install -g eslint prettier || true
3737}
3838
@@ -50,11 +50,11 @@ update_node() {
5050 nvm use default || true
5151 fi
5252 # Ensure corepack shims are present
53- corepack enable || true
53+ corepack enable 2> /dev/null || true
5454 npm install -g npm@latest || true
5555 # Update pnpm and yarn via corepack; fall back to npm global if corepack unavailable
56- corepack prepare pnpm@latest --activate || npm install -g pnpm@latest || true
57- corepack prepare yarn@1 --activate || npm install -g yarn@latest || true
56+ corepack prepare pnpm@latest --activate 2> /dev/null || npm install -g pnpm@latest || true
57+ corepack prepare yarn@1 --activate 2> /dev/null || npm install -g yarn@latest || true
5858 npm update -g eslint prettier || true
5959}
6060
Original file line number Diff line number Diff line change @@ -166,7 +166,12 @@ stage_2_managers() {
166166
167167 # Language-specific package managers
168168 if command -v pip3 > /dev/null 2>&1 ; then
169- run_cmd " pip" python3 -m pip install --user --upgrade pip || log_skip " pip (failed)"
169+ # Check if in virtualenv - skip --user flag if so
170+ if [ -n " ${VIRTUAL_ENV:- } " ]; then
171+ run_cmd " pip" python3 -m pip install --upgrade pip || log_skip " pip (failed)"
172+ else
173+ run_cmd " pip" python3 -m pip install --user --upgrade pip || log_skip " pip (failed)"
174+ fi
170175 else
171176 log_skip " pip (not installed)"
172177 fi
@@ -178,7 +183,12 @@ stage_2_managers() {
178183 fi
179184
180185 if command -v pipx > /dev/null 2>&1 ; then
181- run_cmd " pipx" pip3 install --user --upgrade pipx || log_skip " pipx (failed)"
186+ # Check if in virtualenv - skip --user flag if so
187+ if [ -n " ${VIRTUAL_ENV:- } " ]; then
188+ run_cmd " pipx" pip3 install --upgrade pipx || log_skip " pipx (failed)"
189+ else
190+ run_cmd " pipx" pip3 install --user --upgrade pipx || log_skip " pipx (failed)"
191+ fi
182192 else
183193 log_skip " pipx (not installed)"
184194 fi
You can’t perform that action at this time.
0 commit comments