rvm 0.1.45 → 0.1.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/binscripts/rvm-auto-ruby +1 -0
- data/binscripts/rvm-update-head +2 -2
- data/binscripts/rvm-update-latest +1 -1
- data/config/db +3 -3
- data/config/known +3 -3
- data/config/md5 +6 -4
- data/contrib/install-system-wide +47 -31
- data/install +23 -23
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/alias +3 -3
- data/scripts/cleanup +1 -1
- data/scripts/cli +5 -5
- data/scripts/db +2 -2
- data/scripts/docs +2 -2
- data/scripts/fetch +4 -4
- data/scripts/gemsets +25 -25
- data/scripts/info +3 -9
- data/scripts/initialize +2 -2
- data/scripts/install +23 -23
- data/scripts/list +2 -2
- data/scripts/manage +50 -50
- data/scripts/migrate +15 -15
- data/scripts/monitor +1 -1
- data/scripts/package +2 -2
- data/scripts/repair +3 -3
- data/scripts/rubygems +6 -6
- data/scripts/rvm +1 -1
- data/scripts/rvm-install +23 -23
- data/scripts/selector +10 -10
- data/scripts/set +9 -8
- data/scripts/snapshot +17 -17
- data/scripts/update +23 -23
- data/scripts/utility +39 -36
- data/scripts/wrapper +4 -4
- metadata +4 -4
data/scripts/update
CHANGED
@@ -96,8 +96,8 @@ rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
|
|
96
96
|
rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
|
97
97
|
|
98
98
|
if [[ "$rvm_selfcontained" = "0" ]] ; then
|
99
|
-
rvm_bin_path="${rvm_bin_path:-"$rvm_prefix
|
100
|
-
rvm_man_path="${rvm_man_path:-"$rvm_prefix
|
99
|
+
rvm_bin_path="${rvm_bin_path:-"${rvm_prefix}bin"}"
|
100
|
+
rvm_man_path="${rvm_man_path:-"${rvm_prefix}share/man"}"
|
101
101
|
rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
|
102
102
|
else
|
103
103
|
rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
|
@@ -126,11 +126,11 @@ fi
|
|
126
126
|
|
127
127
|
spinner
|
128
128
|
|
129
|
-
mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
|
129
|
+
\mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
|
130
130
|
|
131
131
|
for file in README LICENCE ; do
|
132
132
|
spinner
|
133
|
-
cp -f "$source_path/$file" "$rvm_path/"
|
133
|
+
\cp -f "$source_path/$file" "$rvm_path/"
|
134
134
|
done
|
135
135
|
|
136
136
|
#
|
@@ -138,22 +138,22 @@ done
|
|
138
138
|
#
|
139
139
|
for dir_name in config scripts examples lib hooks help patches; do
|
140
140
|
spinner
|
141
|
-
mkdir -p "$rvm_path/$dir_name"
|
141
|
+
\mkdir -p "$rvm_path/$dir_name"
|
142
142
|
if [[ -d "$source_path/$dir_name" ]] ; then
|
143
|
-
cp -Rf "$source_path/$dir_name" "$rvm_path"
|
143
|
+
\cp -Rf "$source_path/$dir_name" "$rvm_path"
|
144
144
|
fi
|
145
145
|
done ; unset dir_name
|
146
146
|
|
147
147
|
spinner
|
148
148
|
if [[ ! -s "$rvm_config_path/user" ]] ; then
|
149
|
-
mkdir -p "$rvm_config_path/"
|
149
|
+
\mkdir -p "$rvm_config_path/"
|
150
150
|
echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
|
151
151
|
fi
|
152
152
|
|
153
153
|
scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
|
154
154
|
for script_name in "${scripts[@]}" ; do
|
155
155
|
spinner
|
156
|
-
chmod +x $rvm_scripts_path/$script_name
|
156
|
+
chmod +x "$rvm_scripts_path/$script_name" 2>/dev/null # Hide errors.
|
157
157
|
done
|
158
158
|
|
159
159
|
#
|
@@ -162,8 +162,8 @@ done
|
|
162
162
|
# Cleanse and purge...
|
163
163
|
for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
|
164
164
|
spinner && perl -e 'sleep 0.2'
|
165
|
-
rm -f "$rvm_bin_path/$file"
|
166
|
-
cp -f "$source_path/binscripts/$file" $rvm_bin_path/
|
165
|
+
\rm -f "$rvm_bin_path/$file"
|
166
|
+
\cp -f "$source_path/binscripts/$file" $rvm_bin_path/
|
167
167
|
done
|
168
168
|
spinner
|
169
169
|
chmod +x $rvm_bin_path/*
|
@@ -176,7 +176,7 @@ if [[ -n "$rvm_auto_flag" ]] ; then
|
|
176
176
|
printf "Checking rc files... ($rvm_rc_files)"
|
177
177
|
if [[ "$rvm_loaded_flag" != "1" ]] ; then
|
178
178
|
for rcfile in $(echo $rvm_rc_files) ; do
|
179
|
-
if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
|
179
|
+
if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
|
180
180
|
if [[ -s "$HOME/.profile" ]] ; then
|
181
181
|
if ! grep -q '.profile' "$rcfile" ; then
|
182
182
|
echo " Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
|
@@ -196,26 +196,26 @@ fi
|
|
196
196
|
#
|
197
197
|
spinner
|
198
198
|
if [[ -d gemsets/ ]] ; then
|
199
|
-
mkdir -p "$rvm_gemsets_path"
|
199
|
+
\mkdir -p "$rvm_gemsets_path"
|
200
200
|
for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
|
201
201
|
destination="$rvm_gemsets_path/$gemset_file"
|
202
202
|
destination_path="$(dirname "$destination")"
|
203
203
|
if [[ ! -s "$destination" ]] ; then
|
204
|
-
mkdir -p "$destination_path"
|
205
|
-
cp "gemsets/$gemset_file" "$destination"
|
204
|
+
\mkdir -p "$destination_path"
|
205
|
+
\cp "gemsets/$gemset_file" "$destination"
|
206
206
|
fi
|
207
207
|
done ; unset destination destination_path gemset_file
|
208
208
|
fi
|
209
209
|
|
210
210
|
spinner
|
211
211
|
if [[ -d patchsets/ ]] ; then
|
212
|
-
mkdir -p "$rvm_patchsets_path"
|
212
|
+
\mkdir -p "$rvm_patchsets_path"
|
213
213
|
for patchset_file in $(cd patchsets ; find . -iname '*' | sed 's/^\.\///') ; do
|
214
214
|
destination="$rvm_patchsets_path/$patchset_file"
|
215
215
|
destination_path="$(dirname "$destination")"
|
216
216
|
if [[ ! -s "$destination" ]] ; then
|
217
|
-
mkdir -p "$destination_path"
|
218
|
-
cp "patchsets/$patchset_file" "$destination"
|
217
|
+
\mkdir -p "$destination_path"
|
218
|
+
\cp "patchsets/$patchset_file" "$destination"
|
219
219
|
fi
|
220
220
|
done ; unset destination destination_path patchset_file
|
221
221
|
fi
|
@@ -224,7 +224,7 @@ fi
|
|
224
224
|
# Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
|
225
225
|
#
|
226
226
|
rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
|
227
|
-
mkdir -p "$rvm_rubies_path/"
|
227
|
+
\mkdir -p "$rvm_rubies_path/"
|
228
228
|
spinner
|
229
229
|
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
|
230
230
|
if [[ -d "$ruby" ]] ; then
|
@@ -280,7 +280,7 @@ if [[ -s "$rvm_config_path/default" ]]; then
|
|
280
280
|
$rvm_scripts_path/alias create default "$original_version" &> /dev/null
|
281
281
|
fi
|
282
282
|
unset original_version
|
283
|
-
rm -rf "$rvm_config_path/default"
|
283
|
+
\rm -rf "$rvm_config_path/default"
|
284
284
|
fi
|
285
285
|
|
286
286
|
#
|
@@ -288,14 +288,14 @@ fi
|
|
288
288
|
#
|
289
289
|
|
290
290
|
printf "\n Correct permissions for base binaries in $rvm_bin_path..."
|
291
|
-
mkdir -p $rvm_bin_path
|
291
|
+
\mkdir -p $rvm_bin_path
|
292
292
|
for file in rvm rvmsudo rvm-shell rvm-auto-ruby; do
|
293
293
|
[[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
|
294
294
|
done; unset file
|
295
295
|
printf "\n Copying manpages into place."
|
296
296
|
for man_file in $(\ls "$install_source_path/man"); do
|
297
|
-
rm -rf "$rvm_man_path/$man_file"
|
298
|
-
cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
|
297
|
+
\rm -rf "$rvm_man_path/$man_file"
|
298
|
+
\cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
|
299
299
|
done
|
300
300
|
|
301
301
|
[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
|
@@ -319,7 +319,7 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
|
|
319
319
|
check_rubyopt_conditions
|
320
320
|
printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
|
321
321
|
else
|
322
|
-
if [[
|
322
|
+
if [[ "$rvm_selfcontained" = "1" ]] ; then
|
323
323
|
printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
|
324
324
|
printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
|
325
325
|
printf "\n [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
|
data/scripts/utility
CHANGED
@@ -46,10 +46,10 @@ __rvm_dump_environment() {
|
|
46
46
|
local dump_environment_type="$(echo "$rvm_dump_environment_flag" | awk -F, '{print $2}')"
|
47
47
|
if [[ -n "$dump_environment_file" && -n "$dump_environment_type" ]]; then
|
48
48
|
if [[ "$dump_environment_type" == "atheis"* ]]; then
|
49
|
-
rm -rf "$dump_environment_file" && ln -s /dev/null "$dump_environment_file" >/dev/null 2>&1
|
49
|
+
\rm -rf "$dump_environment_file" && ln -s /dev/null "$dump_environment_file" >/dev/null 2>&1
|
50
50
|
else
|
51
51
|
$rvm_scripts_path/environment-convertor "$dump_environment_type" "$(__rvm_environment_identifier)" > "$dump_environment_file"
|
52
|
-
[[ "$?" -gt 0 ]] && rm -rf "$dump_environment_file"
|
52
|
+
[[ "$?" -gt 0 ]] && \rm -rf "$dump_environment_file"
|
53
53
|
fi
|
54
54
|
fi
|
55
55
|
unset rvm_dump_environment_flag
|
@@ -173,8 +173,8 @@ __rvm_run() {
|
|
173
173
|
$rvm_scripts_path/log "debug" "Executing: $command"
|
174
174
|
fi
|
175
175
|
|
176
|
-
mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
|
177
|
-
touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
|
176
|
+
\mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
|
177
|
+
\touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
|
178
178
|
echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
|
179
179
|
if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
|
180
180
|
eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
|
@@ -195,8 +195,8 @@ __rvm_run_with_env() {
|
|
195
195
|
$rvm_scripts_path/log "debug" "Executing: $command in environment "$env_name""
|
196
196
|
fi
|
197
197
|
|
198
|
-
mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
|
199
|
-
touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
|
198
|
+
\mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
|
199
|
+
\touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
|
200
200
|
echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command # under $env_name" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
|
201
201
|
if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
|
202
202
|
eval "__rvm_with_env '$env_name' '$command'" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
|
@@ -273,7 +273,7 @@ __rvm_inherit_trace_flag() {
|
|
273
273
|
__rvm_cleanup_temp_for() {
|
274
274
|
[[ -z "$1" ]] && return 1
|
275
275
|
if [[ -d "$rvm_tmp_path/" ]]; then
|
276
|
-
rm -rf "$rvm_tmp_path/$1"* >/dev/null 2>&1
|
276
|
+
\rm -rf "$rvm_tmp_path/$1"* >/dev/null 2>&1
|
277
277
|
fi
|
278
278
|
exit
|
279
279
|
}
|
@@ -360,13 +360,13 @@ __rvm_reset() {
|
|
360
360
|
PATH="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
|
361
361
|
PATH="$rvm_bin_path:$PATH" ; export PATH
|
362
362
|
|
363
|
-
for flag in default passenger editor ; do rm -f "$rvm_bin_path"/${flag}_* ; done
|
363
|
+
for flag in default passenger editor ; do \rm -f "$rvm_bin_path"/${flag}_* ; done
|
364
364
|
unset flag
|
365
365
|
|
366
366
|
for file in system default ; do
|
367
|
-
[[ -f "${rvm_path}/${file}" ]] && rm -f "$rvm_path/${file}"
|
368
|
-
[[ -f "${rvm_config_path}/${file}" ]] && rm -f "$rvm_config_path/${file}"
|
369
|
-
[[ -f "${rvm_environments_path}/${file}" ]] && rm -f "$rvm_environments_path/${file}"
|
367
|
+
[[ -f "${rvm_path}/${file}" ]] && \rm -f "$rvm_path/${file}"
|
368
|
+
[[ -f "${rvm_config_path}/${file}" ]] && \rm -f "$rvm_config_path/${file}"
|
369
|
+
[[ -f "${rvm_environments_path}/${file}" ]] && \rm -f "$rvm_environments_path/${file}"
|
370
370
|
done; unset file
|
371
371
|
|
372
372
|
# Go back to a clean state.
|
@@ -377,7 +377,7 @@ __rvm_reset() {
|
|
377
377
|
$rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
|
378
378
|
done ; unset system_config variable
|
379
379
|
|
380
|
-
rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
|
380
|
+
\rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
|
381
381
|
}
|
382
382
|
|
383
383
|
# Implode removes the entire rvm installation under $rvm_path.
|
@@ -391,7 +391,7 @@ __rvm_implode() {
|
|
391
391
|
else
|
392
392
|
if [[ -d "$rvm_path" ]] ; then
|
393
393
|
$rvm_scripts_path/log "info" "Hai! Removing $rvm_path"
|
394
|
-
rm -rf $rvm_path/
|
394
|
+
\rm -rf $rvm_path/
|
395
395
|
echo "$rvm_path has been removed."
|
396
396
|
else
|
397
397
|
$rvm_scripts_path/log "info" "It appears that $rvm_path is already non existant."
|
@@ -423,11 +423,11 @@ __rvm_initialize() {
|
|
423
423
|
__rvm_clean_path
|
424
424
|
|
425
425
|
if echo "$PATH" | grep -q 'rvm\/bin:' ; then
|
426
|
-
PATH="$rvm_bin_path:$PATH"
|
426
|
+
PATH="${rvm_bin_path}:$PATH"
|
427
427
|
export PATH
|
428
428
|
fi
|
429
429
|
|
430
|
-
mkdir -p "$rvm_src_path" "$rvm_bin_path" "$rvm_archives_path" "$rvm_gems_path" "$rvm_tmp_path" "$rvm_repo_path"
|
430
|
+
\mkdir -p "$rvm_src_path" "$rvm_bin_path" "$rvm_archives_path" "$rvm_gems_path" "$rvm_tmp_path" "$rvm_repo_path"
|
431
431
|
}
|
432
432
|
|
433
433
|
# Update rubygems or binscripts based on CLI selection.
|
@@ -448,7 +448,7 @@ __rvm_update() {
|
|
448
448
|
# Update rvm using rubygems
|
449
449
|
# If --head was specified, update from git repository master branch.
|
450
450
|
__rvm_update_rvm() {
|
451
|
-
mkdir -p "$rvm_src_path"
|
451
|
+
\mkdir -p "$rvm_src_path"
|
452
452
|
__rvm_pushpop "$rvm_src_path"
|
453
453
|
|
454
454
|
if [[ "$rvm_head_flag" == "1" ]] ; then
|
@@ -481,7 +481,7 @@ __rvm_reboot() {
|
|
481
481
|
if [[ "/" = "$rvm_path" ]] ; then
|
482
482
|
$rvm_scripts_path/log "error" "remove '/' ?!... NO!"
|
483
483
|
else
|
484
|
-
if [[ -d "$rvm_path" ]] ; then rm -rf "$rvm_path/" ; fi
|
484
|
+
if [[ -d "$rvm_path" ]] ; then \rm -rf "$rvm_path/" ; fi
|
485
485
|
fi
|
486
486
|
gem install rvm $rvm_gem_options
|
487
487
|
__rvm_update_rvm
|
@@ -494,7 +494,7 @@ __rvm_reboot() {
|
|
494
494
|
# Create the irbrc for the currently selected ruby installation.
|
495
495
|
__rvm_irbrc() {
|
496
496
|
if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
|
497
|
-
cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
|
497
|
+
\cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
|
498
498
|
fi
|
499
499
|
}
|
500
500
|
|
@@ -593,14 +593,14 @@ __rvm_ensure_has_environment_files() {
|
|
593
593
|
|
594
594
|
# Ensure system is a blank file.
|
595
595
|
if [[ "$environment_identifier" == "system" ]]; then
|
596
|
-
rm -f "$file_name" 2>&1 | grep -v 'rm: cannot remove .* Permission denied'
|
597
|
-
mkdir -p "$(dirname "$file_name")"
|
598
|
-
touch "$file_name" 2>&1 | grep -v 'touch: cannot touch .* Permission denied'
|
596
|
+
\rm -f "$file_name" 2>&1 | grep -v 'rm: cannot remove .* Permission denied'
|
597
|
+
\mkdir -p "$(dirname "$file_name")"
|
598
|
+
\touch "$file_name" 2>&1 | grep -v 'touch: cannot touch .* Permission denied'
|
599
599
|
return
|
600
600
|
fi
|
601
601
|
|
602
602
|
if [[ ! -s "$file_name" ]] ; then
|
603
|
-
mkdir -p "${rvm_environments_path}"
|
603
|
+
\mkdir -p "${rvm_environments_path}"
|
604
604
|
echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path}:\$PATH\"" > $file_name
|
605
605
|
for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
|
606
606
|
eval "export $variable"
|
@@ -620,7 +620,7 @@ __rvm_ensure_has_environment_files() {
|
|
620
620
|
rvm_creating_default_wrappers=1
|
621
621
|
directory_name="$rvm_wrappers_path/$wrapper_identifier"
|
622
622
|
if [[ ! -L "$directory_name" && ! -d "$directory_name" ]]; then
|
623
|
-
mkdir -p "$directory_name"
|
623
|
+
\mkdir -p "$directory_name"
|
624
624
|
$rvm_scripts_path/wrapper "$wrapper_identifier" &> /dev/null
|
625
625
|
fi
|
626
626
|
unset rvm_creating_default_wrappers directory_name
|
@@ -665,12 +665,13 @@ __rvm_project_rvmrc() {
|
|
665
665
|
while : ; do
|
666
666
|
if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
|
667
667
|
if [[ -n "$rvm_rvmrc_cwd" ]] ; then
|
668
|
-
if [[ -
|
669
|
-
|
668
|
+
if [[ -f "$rvm_environments_path/$rvm_previous_environment" ]] ; then
|
669
|
+
. "$rvm_environments_path/$rvm_previous_environment"
|
670
670
|
else
|
671
|
-
|
672
|
-
|
673
|
-
|
671
|
+
if [[ -f "$rvm_environments_path/default" ]] ; then
|
672
|
+
. "$rvm_environments_path/default"
|
673
|
+
fi
|
674
|
+
fi ; unset rvm_rvmrc_cwd rvm_previous_environment
|
674
675
|
fi
|
675
676
|
break
|
676
677
|
else
|
@@ -695,11 +696,11 @@ __rvm_record_install() {
|
|
695
696
|
local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
|
696
697
|
local rvm_install_record_file="$rvm_config_path/installs"
|
697
698
|
local rvm_install_command="$(echo "$recorded_ruby_name $rvm_install_arguments" | __rvm_strip)"
|
698
|
-
touch "$rvm_install_record_file"
|
699
|
-
rm -f "$rvm_install_record_file.tmp"
|
699
|
+
\touch "$rvm_install_record_file"
|
700
|
+
\rm -f "$rvm_install_record_file.tmp"
|
700
701
|
cat "$rvm_install_record_file" | grep -v "^$recorded_ruby_name " > "$rvm_install_record_file.tmp"
|
701
702
|
echo "$rvm_install_command" >> "$rvm_install_record_file.tmp"
|
702
|
-
rm -f "$rvm_install_record_file"
|
703
|
+
\rm -f "$rvm_install_record_file"
|
703
704
|
mv "$rvm_install_record_file.tmp" "$rvm_install_record_file"
|
704
705
|
}
|
705
706
|
|
@@ -709,7 +710,7 @@ __rvm_remove_install_record() {
|
|
709
710
|
if [[ -s "$rvm_install_record_file" ]]; then
|
710
711
|
mv "$rvm_install_record_file" "$rvm_install_record_file.tmp"
|
711
712
|
cat "$rvm_install_record_file.tmp" | grep -v "^$recorded_ruby_name " > "$rvm_install_record_file"
|
712
|
-
rm -f "$rvm_install_record_file.tmp"
|
713
|
+
\rm -f "$rvm_install_record_file.tmp"
|
713
714
|
fi
|
714
715
|
}
|
715
716
|
|
@@ -736,14 +737,16 @@ __rvm_environment_identifier() {
|
|
736
737
|
|
737
738
|
__rvm_expand_ruby_string() {
|
738
739
|
if [[ -z "$1" || "$1" = "all" || "$1" == "all-gemsets" ]]; then
|
739
|
-
$rvm_scripts_path/list gemsets strings
|
740
|
+
$rvm_scripts_path/list gemsets strings | __rvm_strip
|
741
|
+
elif [[ "$1" == "default-with-rvmrc" || "$1" == "rvmrc" ]]; then
|
742
|
+
$rvm_scripts_path/tools path-identifier "$(pwd)"
|
740
743
|
elif [[ "$1" == "all-rubies" || "$1" == "rubies" ]]; then
|
741
|
-
$rvm_scripts_path/list strings | tr ' ' "\n"
|
744
|
+
$rvm_scripts_path/list strings | tr ' ' "\n" | __rvm_strip
|
742
745
|
elif [[ "$1" == "current" || "$1" == "gemsets" ]]; then
|
743
746
|
local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
|
744
|
-
rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/"
|
747
|
+
rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/" | __rvm_strip
|
745
748
|
elif [[ "$1" == "aliases" ]]; then
|
746
|
-
cat "$rvm_config_path/alias" | awk -F= '{print $1}'
|
749
|
+
cat "$rvm_config_path/alias" | awk -F= '{print $1}' | __rvm_strip
|
747
750
|
else
|
748
751
|
echo "$1" | tr "," "\n" | __rvm_strip
|
749
752
|
fi
|
data/scripts/wrapper
CHANGED
@@ -11,8 +11,8 @@ full_binary_name() {
|
|
11
11
|
}
|
12
12
|
|
13
13
|
wrap() {
|
14
|
-
mkdir -p "$(dirname "$file_name")"
|
15
|
-
rm -f "$file_name"
|
14
|
+
\mkdir -p "$(dirname "$file_name")"
|
15
|
+
\rm -f "$file_name"
|
16
16
|
|
17
17
|
echo "#!/usr/bin/env sh" > "$file_name"
|
18
18
|
echo "if [ -s \"${rvm_environments_path}/${environment_identifier}\" ] ; then" >> "$file_name"
|
@@ -31,7 +31,7 @@ symlink_binary() {
|
|
31
31
|
# We first check if we can wrap the binary and if we were able to,
|
32
32
|
# we then symlink it into place.
|
33
33
|
if wrap_binary && [[ -f "$file_name" ]]; then
|
34
|
-
rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
|
34
|
+
\rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
|
35
35
|
ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
|
36
36
|
fi
|
37
37
|
}
|
@@ -98,7 +98,7 @@ for binary_name in $binaries; do
|
|
98
98
|
else
|
99
99
|
destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
|
100
100
|
fi
|
101
|
-
rm -rf "$destination"
|
101
|
+
\rm -rf "$destination"
|
102
102
|
ln -nsf "$file_name" "$destination"
|
103
103
|
fi; unset destination
|
104
104
|
else
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rvm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 71
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 0.1.
|
9
|
+
- 46
|
10
|
+
version: 0.1.46
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Wayne E. Seguin
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-08-
|
18
|
+
date: 2010-08-18 00:00:00 -04:00
|
19
19
|
default_executable: rvm-install
|
20
20
|
dependencies: []
|
21
21
|
|