Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit ab668bf

Browse files
authored
Fix util command (CI Ignore)
1 parent d30a292 commit ab668bf

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

script-library/shared/utils.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,18 @@ detect_user() {
33
local user_variable_name=${1:-username}
44
local user_variable_value=${!user_variable_name}
55
local possible_users=${2:-("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")}
6-
local uid_variable_name=${3:-user_uid}
7-
local gid_variable_name=${4:-user_gid}
86
if [ "${user_variable_value}" = "auto" ] || [ "${user_variable_value}" = "automatic" ]; then
97
declare -g ${user_variable_name}=vscode
108
for current_user in ${possible_users[@]}; do
119
if id -u ${current_user} > /dev/null 2>&1; then
12-
declare -g ${user_variable_nam}e=${current_user}
10+
declare -g ${user_variable_name}=${current_user}
1311
break
1412
fi
1513
done
16-
if [ "${user_variable_value}" = "" ]; then
17-
declare -g ${user_variable_name}=vscode
18-
fi
19-
elif [ "${user_variable_value}" = "none" ]; then
14+
elif [ "${user_variable_value}" = "none" ] || ! id "${user_variable_value}" > /dev/null 2>&1; then
2015
declare -g ${user_variable_name}=root
21-
declare -g ${uid_variable_name}=0
22-
declare -g ${gid_variable_name}=0
2316
fi
2417
}
25-
2618
# Use Oryx to install something using a partial version match
2719
oryx_install() {
2820
local platform=$1

0 commit comments

Comments
 (0)