Skip to content

Commit

Permalink
Merge remote branch 'origin/set-warning'
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Aug 21, 2010
2 parents 66725bb + 2f971fe commit 3bd60fd
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions scripts/set
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ if [[ -z "$1" ]] ; then
exit 1
fi

action="$1" ; shift
args="$*"

__rvm_attempt_single_exec() {
# Return if we have multiple rubies. or we're not running exec.
local ruby_string_lines="$(printf "$rvm_ruby_strings" | wc -l | __rvm_strip)"
Expand Down Expand Up @@ -160,6 +157,16 @@ __rvm_json() {

rubies=() ; successes=() ; errors=() ; statuses=()


action="$1";
[[ "$#" -gt 0 ]] && shift
args="$*"

if [[ "$action" == "ruby" ]] && echo "$args" | grep -q "^'--[^[:space:]]*'$" ; then
$rvm_scripts_path/log "warn" "You called rvm ruby with the arguments $args which look like use options."
$rvm_scripts_path/log "warn" "Please note that 'rvm ruby' invokes set operations instead."
fi

rvm_ruby_strings="$(__rvm_expand_ruby_string "$rvm_ruby_strings")"

# Check for a single ruby && exec if present.
Expand Down

0 comments on commit 3bd60fd

Please sign in to comment.