summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2011-01-20 10:33:47 +0100
committerTobias Klauser <tklauser@distanz.ch>2011-01-20 10:33:47 +0100
commitd0b2b2c77f4f040ce9278615c37e53c8eb9e5f1d (patch)
tree88aa5e73a12ba69ae4772c6d0d89e49bcb5b3001
parent8af38e92e03760c27ad02dc939db70d20250b7cd (diff)
Reorder path setting
-rw-r--r--.zsh/zshenv/00_dirs4
-rw-r--r--.zsh/zshenv/01_path18
-rw-r--r--.zsh/zshenv/99_android16
3 files changed, 12 insertions, 26 deletions
diff --git a/.zsh/zshenv/00_dirs b/.zsh/zshenv/00_dirs
index 46c4708..a552299 100644
--- a/.zsh/zshenv/00_dirs
+++ b/.zsh/zshenv/00_dirs
@@ -8,9 +8,7 @@
# Source repository: git://git.distanz.ch/dotfiles/zsh.git
#
-export BINDIR=$HOME/bin
-export NIOS2NOMMUBINDIR=/opt/nios2/bin
-export NIOS2MMUBINDIR=$HOME/src/nios2-linux/toolchain-mmu/x86-linux2/bin
+export BINDIR=
export ALTERADIR=/opt/altera9.1
# vim:ft=zsh
diff --git a/.zsh/zshenv/01_path b/.zsh/zshenv/01_path
index daa2511..1bde683 100644
--- a/.zsh/zshenv/01_path
+++ b/.zsh/zshenv/01_path
@@ -1,14 +1,15 @@
# zshenv/01_path
#
-# Adds custom directories to the $PATH
+# Functions to add custom directories to the $PATH
#
+# Copyright © 2011 Tobias Klauser <tklauser@distanz.ch>
# Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
# Released under the terms of the Artistic Licence 2.0
#
-# Source repository: git://git.madduck.net/etc/zsh.git
+# Source repository: git://git.distanz.ch/dotfiles/zsh.git
#
-__prepend_dir_to_path()
+path_prepend()
{
local dir
for dir; do
@@ -19,7 +20,7 @@ __prepend_dir_to_path()
done
}
-__append_dir_to_path()
+path_append()
{
local dir
for dir; do
@@ -30,8 +31,11 @@ __append_dir_to_path()
done
}
-__prepend_dir_to_path $BINDIR
-__append_dir_to_path $NIOS2NOMMUBINDIR
-__append_dir_to_path $NIOS2MMUBINDIR
+# add the paths here
+
+path_prepend $HOME/bin
+path_append /opt/nios2/bin
+path_append /opt/nios2mmu/x86-linux2/bin
+path_append /opt/android-sdk-linux_86
# vim:ft=zsh
diff --git a/.zsh/zshenv/99_android b/.zsh/zshenv/99_android
deleted file mode 100644
index 971c23c..0000000
--- a/.zsh/zshenv/99_android
+++ /dev/null
@@ -1,16 +0,0 @@
-# zshenv/99_android
-#
-# Set variables related to the Android SDK
-#
-# Copyright © 2010 Tobias Klauser <tklauser@distanz.ch>
-# Released under the terms of the Artistic Licence 2.0
-#
-# Source repository: git://git.distanz.ch/dotfiles/zsh.git
-
-_ANDROID_SDK=/opt/android-sdk-linux_86
-
-if [ -d $_ANDROID_SDK ] ; then
- export PATH=$PATH:$_ANDROID_SDK/tools
-fi
-
-# vim:ft=zsh