X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=adc2ce6b804388f1809fe6c47ca8d92bd3e72550;hb=bd7300f75b51e5ee9905d7f03095828b7bb70976;hp=1be636c42c91e50bc47ec3d08cfc832fca567259;hpb=5ce0b37429d5311d52568524c7a07785c95c97de;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index 1be636c..adc2ce6 100755 --- a/setup.sh +++ b/setup.sh @@ -66,7 +66,8 @@ chmod 0600 ~/.less # Custom colors for GNU ls. if installed dircolors; then - dircolors -b shell/dircolors.in > shell/dircolors + echo '# WARNING! DO NOT EDIT THIS FILE!' > shell/dircolors + dircolors -b shell/dircolors.in >> shell/dircolors fi # Find the required options to get colored ls output. GNU ls is preferred. See @@ -116,6 +117,11 @@ generate perl shell/aliases \ }' \ "$ls_env" "$ls_path" "$ls_color" "$column" +# If `tig` is not available use my simple replacement. +if ! installed tig; then + echo "alias tig='git tig'" >>shell/aliases +fi + # Check if grep supports --color=auto. if echo test | grep --color=auto test >/dev/null 2>&1; then : @@ -261,4 +267,6 @@ if installed htop; then mkdir -p ~/.config/htop link htoprc ~/.config/htop/htoprc fi - +if test -d ~/.ssh && test -O ~/.ssh; then + link ssh_config ~/.ssh/config +fi