support MacOS

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/+bin/git-new-workdir b/+bin/git-new-workdir
index 2838546..afca6da 100755 (executable)
--- a/+bin/git-new-workdir
+++ b/+bin/git-new-workdir
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. "$(dirname "$0")/setup.sh"
+
 usage () {
        echo "usage:" $@
        exit 127

diff --git a/+bin/git-up b/+bin/git-up
index 282eb06..c0172a2 100755 (executable)
--- a/+bin/git-up
+++ b/+bin/git-up
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. "$(dirname "$0")/setup.sh"
+
 OPTIONS_SPEC="\
 $(basename $0) [options] [<remote> [<branch>]]
 --

diff --git a/+bin/madconf b/+bin/madconf
index dfccb81..cba54fd 100755 (executable)
--- a/+bin/madconf
+++ b/+bin/madconf
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+. "$(dirname "$0")/setup.sh"
+
 dotfiles="$(dirname "$(dirname "$(readlink -f "$0")")")"
 
 dot_ln() {
-    rel="$(echo "${1#$dotfiles/}" | sed -e 's~[^/]\+~..~g')/"
-    ln -s "${rel#../}${1#$HOME/}" "$HOME/$2"
+    rel="$(echo "${1#$dotfiles/}" | sed -e 's~[^/][^/]*~..~g')/"
+    ln -sf "${rel#../}${1#$HOME/}" "$HOME/$2"
 }
 
 find $dotfiles -mindepth 1 -type d \( -name '[+.]*' -prune -o -print \) | while read d; do

diff --git a/+bin/objdump-sym b/+bin/objdump-sym
index 89e0331..e1292ac 100755 (executable)
--- a/+bin/objdump-sym
+++ b/+bin/objdump-sym
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. "$(dirname "$0")/setup.sh"
+
 exe="$1"
 sym="$2"
 

diff --git a/+bin/setup.sh b/+bin/setup.sh
new file mode 100644 (file)
index 0000000..d2b1fe1
--- /dev/null
+++ b/+bin/setup.sh
@@ -0,0 +1,6 @@
+case "$(uname)" in
+  Darwin)
+    PATH="$(brew --prefix coreutils)/libexec/gnubin:$PATH"
+    export PATH
+    ;;
+esac

diff --git a/config/zsh/10_zshopts b/config/zsh/10_zshopts
index a367d09..1314ea5 100644 (file)
--- a/config/zsh/10_zshopts
+++ b/config/zsh/10_zshopts
@@ -1,6 +1,6 @@
 #! /bin/zsh
 
-if test -x =dircolors; then
+if which dircolors &> /dev/null; then
     eval "`dircolors`"
     export LS_COLORS="*.ogm=01;35:${LS_COLORS}"
     export ZLS_COLORS=$LS_COLORS

diff --git a/config/zsh/20_environment b/config/zsh/20_environment
index 6c33ec7..8c1e026 100644 (file)
--- a/config/zsh/20_environment
+++ b/config/zsh/20_environment
@@ -38,6 +38,6 @@ else
     esac
 fi
 
-if test -z "$TZ"; then
+if test -f /etc/timezone -a -z "$TZ"; then
     export TZ=$(cat /etc/timezone)
 fi

diff --git a/config/zsh/50_aliases b/config/zsh/50_aliases
index d1f0416..c391178 100644 (file)
--- a/config/zsh/50_aliases
+++ b/config/zsh/50_aliases
@@ -1,5 +1,13 @@
 #!/bin/zsh
 
+local g
+
+case $(uname) in
+    Darwin)
+        g=g
+        ;;
+esac
+
 autoload zmv
 alias mmv='noglob zmv -W'
 
@@ -13,71 +21,25 @@ fi
 alias du="du -hcs"
 alias df="df -h"
 
-case "${$(ls --version | head -1)##* }" in
+case "${$(${g}ls --version | head -1)##* }" in
     [0-5].*)
-        alias ls="ls -bCF --color=auto"
+        alias ls="${g}ls -bCF --color=auto"
         ;;
     *)
-        alias ls="ls --group-directories-first -bCF --color=auto"
+        alias ls="${g}s --group-directories-first -bCF --color=auto"
         ;;
 esac
 
-alias la="ls --color=always -a"
-alias ll="ls --color=always -l"
-alias lla="ls --color=always -la"
-alias lal="ls --color=always -la"
+alias la="${g}ls --color=always -a"
+alias ll="${g}ls --color=always -l"
+alias lla="${g}ls --color=always -la"
+alias lal="${g}ls --color=always -la"
 
 alias egrep='egrep --color=tty -d skip'
 alias fgrep='fgrep --color=tty -d skip'
 alias grep='grep --color=tty -d skip'
 
-alias md='mkdir'
-alias rd='rmdir'
-alias rm='rm -i'
-alias s2disk='sudo s2disk'
-alias s2both='sudo s2both'
-alias s2ram='sudo s2ram'
-alias opannotate-asm='opannotate  -a --objdump-params -S'
-alias caff='caff -u BC6AFB5BA1EE761C,E34B6A5AFE3AF15F -m yes'
-
 alias v=vim
-alias m=madmutt
 cvi () {
     vim -O ${${1%.[hc]}%.}.{h,c}
 }
-xvi () {
-    vim -O ${${${1%.h}%.cpp}%.}.{h,cpp}
-}
-ovi () {
-    vim -O ${${1%.ml}%.}.ml{i,}
-}
-
-alias br='bts --mbox show'
-
-upload() {
-    debsign *.changes
-    dput -e 0 gluck_delayed *.changes
-}
-
-conf_push () {
-    echo -n "PUSHING TO $1"
-    rsync -au --exclude=.git --delete ~madcoder/.madconf/ "$1":.madconf/
-    ssh "$1" LC_ALL=C .madconf/bin/madconf
-    echo "."
-}
-
-dict () { dictl "$@" 2>&1 | colorit | less -R ; }
-
-vman() {
-    if /usr/bin/man "$@" > /dev/null; then
-        vim -m -n --noplugin -c "set ft=man" -c "noremap q :q<cr>" -c "Man $@"
-    fi
-}
-
-gdbpid() {
-    if test "$1" = $(printf "%d" "$1"); then
-        gdb --pid="$1"
-    else
-        gdb --pid=$(pidof "$1")
-    fi
-}

diff --git a/config/zsh/60_prompt b/config/zsh/60_prompt
index f38bc0b..5c7b02d 100644 (file)
--- a/config/zsh/60_prompt
+++ b/config/zsh/60_prompt
@@ -32,7 +32,7 @@ precmd() {
             branch="$(cut -c1-7 "$git_dir/HEAD")..."
     fi
 
-    psvar[1]="${$(readlink -m "$(git rev-parse --show-cdup)./")/$HOME/~}"
+    psvar[1]="${$(readlink "$(git rev-parse --show-cdup)./")/$HOME/~}"
     psvar[2]="${branch#refs/heads/}"
 }