Permalink
Browse files

--no-same-owner thanks to ngan.

  • Loading branch information...
1 parent 295d65c commit 528f7ed472ca678a5e2b70dbfec3ef98b438acaa @wayneeseguin wayneeseguin committed Apr 27, 2011
Showing with 13 additions and 13 deletions.
  1. +1 −1 binscripts/rvm-install
  2. +1 −1 binscripts/rvm-installer
  3. +2 −2 scripts/functions/packages
  4. +1 −1 scripts/get
  5. +5 −5 scripts/manage
  6. +1 −1 scripts/rubygems
  7. +2 −2 scripts/snapshot
View
@@ -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 zoxf rvm-#{RVM::Version::STRING}.tar.gz}
+ %x{tar zxf --no-same-owner rvm-#{RVM::Version::STRING}.tar.gz}
Dir.chpwd( "rvm-#{RVM::Version::STRING}" ) do
View
@@ -85,7 +85,7 @@ Halting installation.
"
fi
- tar zoxf "${rvm_archives_path}/rvm-${version}.tar.gz" -C "$rvm_src_path/"
+ tar zxf --no-same-owner "${rvm_archives_path}/rvm-${version}.tar.gz" -C "$rvm_src_path/"
cd "$rvm_src_path/rvm-${version}"
}
@@ -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 zxf --no-same-owner $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 jxf --no-same-owner $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" \
"Extracting $package-$version.$archive_format to $rvm_src_path"
;;
View
@@ -65,7 +65,7 @@ get_version()
exit 1
fi
- tar zxf "${rvm_path}/archives/rvm-${version}.tar.gz" -C "$rvm_src_path/"
+ tar zxf --no-same-owner "${rvm_path}/archives/rvm-${version}.tar.gz" -C "$rvm_src_path/"
(
cd "$rvm_src_path/rvm-${version}"
View
@@ -470,7 +470,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 xf --no-same-owner - -C ${rvm_src_path}" \
"$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
result=$?
@@ -573,7 +573,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 xf --no-same-owner - -C ${rvm_src_path}" \
"$rvm_ruby_string - #extracting"
result=$?
@@ -854,7 +854,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 xf --no-same-owner - -C ${rvm_src_path}/$rvm_ruby_string"
result=$?
if (( result > 0 ))
@@ -1311,7 +1311,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 xf --no-same-owner - -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 > 0 ))
@@ -1331,7 +1331,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 xf --no-same-owner - -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 > 0 ))
View
@@ -82,7 +82,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 xf --no-same-owner - -C ${rvm_src_path}" \
"Extracting $rvm_gem_package_name ..."
fi
View
@@ -135,7 +135,7 @@ snapshot_save()
(
builtin cd "$snapshot_temp_path"
__rvm_rm_rf "$destination_path/$1.tar.gz"
- tar czf "$destination_path/$1.tar.gz" .
+ tar czf --no-same-owner "$destination_path/$1.tar.gz" .
result="$?"
__error_on_result "$result" "Error creating archive $destination_path/$1.tar.gz" && return "$result"
)
@@ -172,7 +172,7 @@ snapshot_load()
rvm_log "Extracting snapshot"
(
builtin cd "$snapshot_temp_path"
- tar xozf "$snapshot_archive"
+ tar xzf --no-same-owner "$snapshot_archive"
result="$?"
__error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
)

0 comments on commit 528f7ed

Please sign in to comment.