diff options
author | Hugues Hiegel <hugues.hiegel@openwide.fr> | 2009-06-05 11:11:05 +0200 |
---|---|---|
committer | Hugues Hiegel <hugues.hiegel@openwide.fr> | 2009-06-05 11:11:05 +0200 |
commit | 480e555229ff44478b9b3bdc3d2eee78c9ca8130 (patch) | |
tree | da85dcbc90d383262f576348bf9673cd9eb3bc58 /net:sweethome | |
parent | 8865b771cf355eb00466e9b0f501c14f9979e144 (diff) | |
parent | bcd0823d15c93d0c6ec404860bb45aa8b4e6d283 (diff) |
Merge branch 'master' of maison:/git/zdotdir
Diffstat (limited to 'net:sweethome')
-rw-r--r-- | net:sweethome/host:paranoid/user:hugues/Environment.zsh (renamed from net:sweethome/user:hugues/Environment.zsh) | 0 | ||||
-rw-r--r-- | net:sweethome/host:prunelle/Environment.zsh | 18 | ||||
-rw-r--r-- | net:sweethome/host:prunelle/sys:Darwin/Aliases.zsh (renamed from net:sweethome/host:prunelle/Aliases.zsh) | 10 | ||||
-rw-r--r-- | net:sweethome/host:prunelle/sys:Darwin/Environment.zsh | 25 |
4 files changed, 28 insertions, 25 deletions
diff --git a/net:sweethome/user:hugues/Environment.zsh b/net:sweethome/host:paranoid/user:hugues/Environment.zsh index 22ede24..22ede24 100644 --- a/net:sweethome/user:hugues/Environment.zsh +++ b/net:sweethome/host:paranoid/user:hugues/Environment.zsh diff --git a/net:sweethome/host:prunelle/Environment.zsh b/net:sweethome/host:prunelle/Environment.zsh index 248b742..e96318b 100644 --- a/net:sweethome/host:prunelle/Environment.zsh +++ b/net:sweethome/host:prunelle/Environment.zsh @@ -8,24 +8,6 @@ ## these files with or without this notice. ## -if ( [ "`uname -s`" = "Darwin" ] ) -then - export DISPLAY=:0 - - ## Fink / DarwinPorts - - MANPATH=/usr/share/man - INFOPATH=/usr/share/info - - for i in usr/X11R6 dp sw ; do - export PATH=$PATH:/$i/bin:/$i/sbin - export MANPATH=$MANPATH:/$i/share/man - export INFOPATH=$INFOPATH:/$i/share/info - done - - typeset -gU PATH MANPATH INFOPATH -fi - PS1_USER="1" if [ "$OSTYPE" = "linux-gnu" ] then diff --git a/net:sweethome/host:prunelle/Aliases.zsh b/net:sweethome/host:prunelle/sys:Darwin/Aliases.zsh index 7c2a390..cc1173a 100644 --- a/net:sweethome/host:prunelle/Aliases.zsh +++ b/net:sweethome/host:prunelle/sys:Darwin/Aliases.zsh @@ -7,10 +7,6 @@ ## You are encouraged to use, modify, and redistribute ## these files with or without this notice. ## - -if [ "$OSTYPE" == "Darwin" ] -then - a port='sudo port' - a ls='ls -FG' - a aless='open -a /Applications/DarwinPorts/AquaLess.app' -fi +a port='sudo port' +a ls='ls -FG' +a aless='open -a /Applications/DarwinPorts/AquaLess.app' diff --git a/net:sweethome/host:prunelle/sys:Darwin/Environment.zsh b/net:sweethome/host:prunelle/sys:Darwin/Environment.zsh new file mode 100644 index 0000000..5fac52b --- /dev/null +++ b/net:sweethome/host:prunelle/sys:Darwin/Environment.zsh @@ -0,0 +1,25 @@ +#!/bin/zsh +## +## Part of configuration files for Zsh 4 +## by Hugues Hiegel <hugues@hiegel.fr> +## +## NO WARRANTY PROVIDED, USE AT YOUR OWN RISKS +## +## You are encouraged to use, modify, and redistribute +## these files with or without this notice. +## + +export DISPLAY=:0 + +## Fink / DarwinPorts + +MANPATH=/usr/share/man +INFOPATH=/usr/share/info + +for i in /dp /sw /usr/X11R6 ; do + export PATH=$i/bin:$i/sbin:$PATH + export MANPATH=$i/share/man:$MANPATH + export INFOPATH=/$i/share/info:$INFOPATH +done + +typeset -gU PATH MANPATH INFOPATH |