273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Refactor] make `check_file_permissions` be pure instead of relying on a closure. 

Also, make it return early, to be a bit more efficient.

(from #847)
Jordan Harband 2016-04-18 18:23:24 -07:00
parent 86c8b116d1
commit 755c39209e
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nvm.sh
View File

@ -1535,6 +1535,20 @@ nvm_is_natural_num() {
esac esac
} }
# Check version dir permissions
nvm_check_file_permissions() {
for FILE in $1/* $1/.[!.]* $1/..?* ; do
if [ -d "$FILE" ]; then
if ! nvm_check_file_permissions "$FILE"; then
return 2
fi
elif [ -e "$FILE" ] && [ ! -w "$FILE" ]; then
return 1
fi
done
return 0
}
nvm() { nvm() {
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
nvm help nvm help
@ -1829,19 +1843,7 @@ nvm() {
NVM_SUCCESS_MSG="Uninstalled node $VERSION" NVM_SUCCESS_MSG="Uninstalled node $VERSION"
fi fi
# Check version dir permissions if ! nvm_check_file_permissions "$VERSION_PATH"; then
local PERMISSIONS_OK=true
check_file_permissions() {
for FILE in $1/* $1/.[!.]* $1/..?* ; do
if [ -d "$FILE" ]; then
check_file_permissions "$FILE"
elif [ -e "$FILE" ]; then
[ ! -w "$FILE" ] && PERMISSIONS_OK=false
fi
done
}
check_file_permissions "$VERSION_PATH"
if [ "$PERMISSIONS_OK" = false ]; then
>&2 echo 'Cannot uninstall, incorrect permissions on installation folder.' >&2 echo 'Cannot uninstall, incorrect permissions on installation folder.'
>&2 echo 'This is usually caused by running `npm install -g` as root. Run the following command as root to fix the permissions and then try again.' >&2 echo 'This is usually caused by running `npm install -g` as root. Run the following command as root to fix the permissions and then try again.'
>&2 echo >&2 echo
@ -2384,7 +2386,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
nvm_ls_remote nvm_ls_remote_iojs nvm_ls_remote_index_tab \ nvm_ls_remote nvm_ls_remote_iojs nvm_ls_remote_index_tab \
nvm_ls nvm_remote_version nvm_remote_versions \ nvm_ls nvm_remote_version nvm_remote_versions \
nvm_install_iojs_binary nvm_install_node_binary \ nvm_install_iojs_binary nvm_install_node_binary \
nvm_install_node_source \ nvm_install_node_source nvm_check_file_permissions \
nvm_version nvm_rc_version nvm_match_version \ nvm_version nvm_rc_version nvm_match_version \
nvm_ensure_default_set nvm_get_arch nvm_get_os \ nvm_ensure_default_set nvm_get_arch nvm_get_os \
nvm_print_implicit_alias nvm_validate_implicit_alias \ nvm_print_implicit_alias nvm_validate_implicit_alias \