Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'untar-ownership' of https://github.com/meineerde/rvm in…

…to meineerde-untar-ownership
  • Loading branch information...
commit 6b3207287954b9964a746434725fec36ed7e275d 2 parents 73bf6ee + d0be601
@wayneeseguin wayneeseguin authored
View
2  binscripts/rvm-install
@@ -8,7 +8,7 @@ Dir.chpwd( File.join( ENV["GEM_HOME"], "gems", "rvm-#{RVM::Version::STRING}", "r
puts "Extracting bundled rvm-#{RVM::Version::STRING}.tar.gz"
- %x{tar zxf rvm-#{RVM::Version::STRING}.tar.gz}
+ %x{tar zoxf rvm-#{RVM::Version::STRING}.tar.gz}
Dir.chpwd( "rvm-#{RVM::Version::STRING}" ) do
View
2  binscripts/rvm-installer
@@ -85,7 +85,7 @@ Halting installation.
"
fi
- tar zxf "${rvm_archives_path}/rvm-${version}.tar.gz" -C "$rvm_src_path/"
+ tar zoxf "${rvm_archives_path}/rvm-${version}.tar.gz" -C "$rvm_src_path/"
cd "$rvm_src_path/rvm-${version}"
}
View
4 scripts/functions/packages
@@ -20,7 +20,7 @@ install_package()
|| (result=$? && return $result)
__rvm_run "$package/extract" \
- "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" \
+ "tar zxof $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" \
"Extracting $package-$version.$archive_format to $rvm_src_path"
;;
@@ -31,7 +31,7 @@ install_package()
|| (result=$? && return $result)
__rvm_run "$package/extract" \
- "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" \
+ "tar jxof $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" \
"Extracting $package-$version.$archive_format to $rvm_src_path"
;;
View
2  scripts/get
@@ -65,7 +65,7 @@ get_version()
exit 1
fi
- tar zxf "${rvm_path}/archives/rvm-${version}.tar.gz" -C "$rvm_src_path/"
+ tar zxof "${rvm_path}/archives/rvm-${version}.tar.gz" -C "$rvm_src_path/"
(
cd "$rvm_src_path/rvm-${version}"
View
10 scripts/manage
@@ -465,7 +465,7 @@ RubyWrapper
__rvm_rm_rf "${rvm_src_path}/$rvm_ruby_string"
__rvm_run "extract" \
- "gunzip < \"${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C ${rvm_src_path}" \
+ "gunzip < \"${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xof - -C ${rvm_src_path}" \
"$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
result=$?
@@ -565,7 +565,7 @@ RubyWrapper
exit $result
fi
__rvm_run "extract" \
- "gunzip < \"${rvm_archives_path}/$(basename $rvm_ruby_package_file)\" | tar xf - -C ${rvm_src_path}" \
+ "gunzip < \"${rvm_archives_path}/$(basename $rvm_ruby_package_file)\" | tar xof - -C ${rvm_src_path}" \
"$rvm_ruby_string - #extracting"
result=$?
@@ -839,7 +839,7 @@ RubyWrapper
builtin cd "${rvm_src_path}/$rvm_ruby_string"
__rvm_run "gemstone.extract" \
- "gunzip < \"${rvm_archives_path}/${rvm_gemstone_package_file}.${rvm_archive_extension}\" | tar xf - -C ${rvm_src_path}/$rvm_ruby_string"
+ "gunzip < \"${rvm_archives_path}/${rvm_gemstone_package_file}.${rvm_archive_extension}\" | tar xof - -C ${rvm_src_path}/$rvm_ruby_string"
result=$?
if [[ "$result" -gt 0 ]] ; then
@@ -1283,7 +1283,7 @@ __rvm_fetch_ruby()
case "$rvm_archive_extension" in
tar.gz|tgz)
- __rvm_run "extract" "gunzip < \"${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
+ __rvm_run "extract" "gunzip < \"${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xof - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
result=$?
if [[ "$result" -gt 0 ]] ; then
@@ -1301,7 +1301,7 @@ __rvm_fetch_ruby()
fi
;;
tar.bz2)
- __rvm_run "extract" "bunzip2 < '${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension' | tar xf - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
+ __rvm_run "extract" "bunzip2 < '${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension' | tar xof - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
result=$?
if [[ "$result" -gt 0 ]] ; then
View
2  scripts/rubygems
@@ -80,7 +80,7 @@ rubygems_setup()
fi
__rvm_run "rubygems.extract" \
- "gunzip < ${rvm_archives_path}/$rvm_gem_package_name.tgz | tar xf - -C ${rvm_src_path}" \
+ "gunzip < ${rvm_archives_path}/$rvm_gem_package_name.tgz | tar xof - -C ${rvm_src_path}" \
"Extracting $rvm_gem_package_name ..."
fi
View
2  scripts/snapshot
@@ -172,7 +172,7 @@ snapshot_load()
rvm_log "Extracting snapshot"
(
builtin cd "$snapshot_temp_path"
- tar xzf "$snapshot_archive"
+ tar xozf "$snapshot_archive"
result="$?"
__error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
)
Please sign in to comment.
Something went wrong with that request. Please try again.