Wrapper to call a script or a function with a temporarily restored um…

…ask.

scripts/base

@@ -32,7 +32,7 @@ fi
 
 if (( ${rvm_ignore_rvmrc:=0} == 0 ))
 then
-  : rvm_stored_umask:${rvm_stored_umask:=$(umask)}
+  [[ -n "${rvm_stored_umask:-}" ]] || export rvm_stored_umask=$(umask)
   rvm_rvmrc_files=("/etc/rvmrc" "$HOME/.rvmrc")
   if [[ -n "${rvm_prefix:-}" ]] && ! [[ "$HOME/.rvmrc" -ef "${rvm_prefix}/.rvmrc" ]]
      then rvm_rvmrc_files+=( "${rvm_prefix}/.rvmrc" )

scripts/cli

@@ -751,7 +751,7 @@ rvm()
   if
     (( ${rvm_ignore_rvmrc:=0} == 0 ))
   then
-    : rvm_stored_umask:${rvm_stored_umask:=$(umask)}
+    [[ -n "${rvm_stored_umask:-}" ]] || export rvm_stored_umask=$(umask)
     rvm_rvmrc_files=("/etc/rvmrc" "$HOME/.rvmrc")
     if
       [[ -n "${rvm_prefix:-}" ]] &&

scripts/functions/environment

@@ -372,3 +372,18 @@ __rvm_ensure_is_a_function()
     done
   fi
 }
+
+__rvm_call_with_restored_umask()
+{
+  rvm_umask="$(umask)"
+
+  if [[ -n "${rvm_stored_umask:-}" ]];
+  then
+    umask ${rvm_stored_umask}
+  fi
+
+  "$@"
+
+  umask "${rvm_umask}"
+  unset rvm_umask
+}

scripts/functions/init

@@ -9,7 +9,7 @@ __rvm_load_rvmrc()
     return 0
   fi
 
-  : rvm_stored_umask:${rvm_stored_umask:=$(umask)}
+  [[ -n "${rvm_stored_umask:-}" ]] || export rvm_stored_umask=$(umask)
 
   rvm_rvmrc_files=("/etc/rvmrc" "$HOME/.rvmrc")
   if [[ -n "${rvm_prefix:-}" ]] && ! [[ "$HOME/.rvmrc" -ef "${rvm_prefix}/.rvmrc" ]]

scripts/functions/installer

@@ -25,7 +25,7 @@ install_setup()
 
   if (( ${rvm_ignore_rvmrc:=0} == 0 ))
   then
-    : rvm_stored_umask:${rvm_stored_umask:=$(umask)}
+    [[ -n "${rvm_stored_umask:-}" ]] || export rvm_stored_umask=$(umask)
 
     rvm_rvmrc_files=("/etc/rvmrc" "$HOME/.rvmrc")
     if [[ -n "${rvm_prefix:-}" ]] && ! [[ "$HOME/.rvmrc" -ef "${rvm_prefix}/.rvmrc" ]]
@@ -841,7 +841,7 @@ if
   test \"\`ps -p \$\$ -o comm=\`\" != dash &&
   test \"\`ps -p \$\$ -o comm=\`\" != sh
 then
-  : rvm_stored_umask:\${rvm_stored_umask:=\$(umask)}
+  [[ -n \"\${rvm_stored_umask:-}\" ]] || export rvm_stored_umask=\$(umask)
   # Load user rvmrc configurations, if exist
   for file in \"/etc/rvmrc\" \"\$HOME/.rvmrc\"
   do

scripts/initialize

@@ -48,7 +48,7 @@ then
   # Ensure that /etc/rvmrc and $HOME/.rvmrc values take precedence.
   if (( ${rvm_ignore_rvmrc:=0} == 0 ))
   then
-    : rvm_stored_umask:${rvm_stored_umask:=$(umask)}
+    [[ -n "${rvm_stored_umask:-}" ]] || export rvm_stored_umask=$(umask)
 
     rvm_rvmrc_files=("/etc/rvmrc" "$HOME/.rvmrc")
     if [[ -n "${rvm_prefix:-}" ]] && ! [[ "$HOME/.rvmrc" -ef "${rvm_prefix}/.rvmrc" ]]

scripts/rvm

@@ -12,7 +12,7 @@
 \export HOME rvm_prefix rvm_user_install_flag rvm_path
 HOME="${HOME%%+(\/)}" # Remove trailing slashes if they exist on HOME
 
-: rvm_stored_umask:${rvm_stored_umask:=$(umask)}
+[[ -n "${rvm_stored_umask:-}" ]] || export rvm_stored_umask=$(umask)
 if (( ${rvm_ignore_rvmrc:=0} == 0 ))
 then
   rvm_rvmrc_files=("/etc/rvmrc" "$HOME/.rvmrc")