X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=30483a0178dea80120bc2c6c6ee1a9dcfdf4d8dc;hb=8e71f6b905ec7ef2105d59a949d784a64ce9a574;hp=365c01bfe8a172431d0d0e48b0618c42743fdeb6;hpb=c3ccdced26ff5d9baf36858968701e7b12447cd6;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index 365c01b..30483a0 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,31 +1,35 @@
 # Zsh configuration file for environment related options.
 
+# Copyright (C) 2011-2014  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/>.
 
-# Get the current hostname (first part before a dot).
-host=${$(hostname)//.*/}
-
-# Load environmental related settings used by all shells.
-if [[ -f ~/.shell/env ]]; then
-    source ~/.shell/env
-# Fallback functions as ~/.shell/env couldn't be loaded.
-else
-    function source_debug() {
-        echo $@
-    }
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
-fi
-
-source_debug "sourcing ~/.zsh/env"
-
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
-
-# Load rc file for current OS.
-source_config ~/.zsh os env $(uname) nolocal
-# Load env file for current hostname (first part before a dot) or env.local.
-source_config ~/.zsh host env $host
-
-source_debug "finished sourcing ~/.zsh/env"
+
+. ~/.shell/functions
+
+source_config ~/.shell/env
+
+
+# Make sure elements in PATH are unique.
+typeset -U path PATH
+
+# Use $TMPDIR/zsh as directory for temporary Zsh files to prevent symlink
+# attacks - only helps if $TMPDIR points to a safe directory (which should be
+# true with the settings in shell/env).
+TMPPREFIX="$TMPDIR/zsh"
+
+
+source_config ~/.zsh/env.local
+
+# vim: ft=zsh