*/rc: Move umask code from zsh/rc to shell/rc.

Also load shell/rc in bash/rc.

diff --git a/bash/rc b/bash/rc
index 948dbe4541ce9e94b4a18dca3dba875510e8b3e7..3dfadbbbecff5968a0781b44fb6db1803b31906c 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -41,6 +41,7 @@ set -o vi
 
 
 source_config ~/.shell/aliases
+source_config ~/.shell/rc
 
 source_config ~/.bash/rc.local
 

diff --git a/shell/rc b/shell/rc
new file mode 100644 (file)
index 0000000..175ed9a
--- /dev/null
+++ b/shell/rc
@@ -0,0 +1,25 @@
+# Shell configuration file.
+
+# Copyright (C) 2013  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Normal umask for root (readable by all users).
+if test "`id -u`" -eq 0; then
+    umask 022
+# Restricted umask for normal users (readable only by me).
+else
+    umask 077
+fi

diff --git a/zsh/rc b/zsh/rc
index 91d1f5de8df17c7b700b20316bd83393801a0299..2d7331ceaf89c95fcd311f327029f229fc632255 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -50,10 +50,9 @@ zshrc_resolve_fg_to_resumed_job_name() {
 
 # MISCELLANEOUS SETTINGS
 
-# Be paranoid, new files are readable/writable by me only, but not as root.
-if [[ $UID -ne 0 ]]; then
-    umask 077
-fi
+# Load general shell setup commands. NOTE: Expand this when publishing the
+# config.
+source_config ~/.shell/rc
 
 # Disable beeps.
 setopt nobeep