contrib/install-system-wide in rvm-0.1.43 vs contrib/install-system-wide in rvm-0.1.44

- old
+ new

@@ -11,26 +11,29 @@ echo "Please ensure git is installed and available in PATH to continue." >&2 exit 1 fi # Load the rvm config. -[[ -s /etc/rvmrc ]] && source /etc/rvmrc -[[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc" +if [[ -z "$rvm_ignore_rvmrc" ]]; then + [[ -s /etc/rvmrc ]] && source /etc/rvmrc + [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc" +fi rvm_path="${rvm_path:-"/usr/local/rvm"}" +export rvm_sandboxed=0 mkdir -p "$rvm_path/src/" builtin cd "$rvm_path/src" rm -rf ./rvm/ git clone --depth 1 git://github.com/wayneeseguin/rvm.git builtin cd rvm -"Running the install script." -bash ./scripts/install +echo "Running the install script." +bash ./scripts/install "$@" rvm_group_name="${rvm_group_name:-"rvm"}" if cat /etc/group | cut -d: -f1 | grep -q "^${rvm_group_name}$"; then echo "Group exists, proceeding with installation." @@ -50,17 +53,16 @@ echo "Generating system wide rvmrc" rm -f /etc/rvmrc touch /etc/rvmrc cat > /etc/rvmrc <<END_OF_RVMRC # Setup default configuration for rvm. -export rvm_path="/usr/local/rvm" +umask g+w +export rvm_sandboxed=0 export rvm_prefix="/usr/local" -export rvm_bin_path="\$rvm_prefix/bin" -export rvm_man_path="\$rvm_prefix/share/man" END_OF_RVMRC -echo "Generating /etc/load_rvm to load rvm" +echo "Generating /usr/local/lib/rvm to load rvm" rm -f /usr/local/lib/rvm touch /usr/local/lib/rvm cat > /usr/local/lib/rvm <<END_OF_RVM_SH # Automatically source rvm if [[ -s "\$HOME/.rvm/scripts/rvm" ]]; then @@ -68,13 +70,13 @@ elif [[ -s "/usr/local/rvm/scripts/rvm" ]]; then source "/usr/local/rvm/scripts/rvm" fi END_OF_RVM_SH -echo "Correct permissions on rvmrc and load_rvm" +echo "Correct permissions on rvmrc and the rvm loader" # Finally, ensure the rvmrc is owned by the group. for file in /etc/rvmrc /usr/local/lib/rvm ; do - chown root:"$rvm_groop_name" "$file" + chown root:"$rvm_group_name" "$file" chmod g+w "$file" done; unset file echo "To use, source '/usr/local/lib/rvm' to your shell profile."