improve extraction errors detection, fix rights for travis, update #1680

.travis.yml

@@ -6,6 +6,7 @@ install:
   - gem install bundler --pre
   - gem install tf -v '>=0.4.1'
 before_script:
+  - sudo chown -R $USER: $rvm_path
   - gem install bundler --pre
   - rvm alias delete default
   - hash -r

scripts/functions/utility

@@ -812,7 +812,7 @@ __rvm_package_extract_run()
 __rvm_package_extract()
 {
   rvm_debug __rvm_package_extract:$#: "$@"
-  typeset __tempdir __path __return
+  typeset __tempdir __path __file __return
   __return=0
   __tempdir="$( TMPDIR="${rvm_tmp_path}" mktemp -d )"
   __rvm_package_extract_run "$1" "$__tempdir" || __return=$?
@@ -821,14 +821,17 @@ __rvm_package_extract()
   then
     for __path in "$__tempdir"/*
     do
-      if [[ -f "$2/${__path##*/}" ]]
-      then rm -rf "$2/${__path##*/}"
+      __file="${__path##*/}"
+      if
+        [[ -n "${__file}" && -e "$2/${__file}" ]]
+      then
+        \rm -rf "$2/${__file}" || __return=$?
       fi
-      mv "${__path}" "$2" || __return=$?
+      \mv -f "${__path}" "$2/" || __return=$?
     done
   fi
   if [[ -n "$__tempdir" ]]
-  then rm -rf "$__tempdir"
+  then \rm -rf "$__tempdir"
   fi
   return $__return
 }