X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=setup.sh;h=1be636c42c91e50bc47ec3d08cfc832fca567259;hb=4bcae02cfd13f42ff10cfef0f6400b98b73de336;hp=041629f0d2bac00071b5c6d709ee33be08dda398;hpb=d3202537f3bcd18f3b0b712d9c670b914d5a230c;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index 041629f..1be636c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
# along with this program. If not, see .
+set -e
+
. ../lib.sh
# Helper functions.
@@ -34,11 +36,21 @@ if ! infocmp > /dev/null 2>&1; then
fi
+# DIRECTORY SETUP
+
# Create private temporary directory used by many tools (including GNU screen
# and tmux).
mkdir -p ~/.tmp
chmod 0700 ~/.tmp
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap
+# Create zsh cache directory.
+mkdir -p zsh/cache
+
+
+# FILE SETUP
+
# Generate ~/.less with lesskey. Prevent cluttering ~/ by storing the history
# file in this directory; this requires replacing the constant HISTORY_PATH in
# lesskey.
@@ -52,24 +64,27 @@ perl < lesskey \
| lesskey -
chmod 0600 ~/.less
+# Custom colors for GNU ls.
+if installed dircolors; then
+ dircolors -b shell/dircolors.in > shell/dircolors
+fi
+
# Find the required options to get colored ls output. GNU ls is preferred. See
# shell/aliases.in for details. Doing this here instead of in shell/aliases
# speeds up shell starts.
#
# Check if colors are available.
-ls --color > /dev/null 2>&1
-if test $? -eq 0; then
+if ls --color > /dev/null 2>&1; then
ls_color=gnu
else
- ls -G > /dev/null 2>&1
- if test $? -eq 0; then
+ if ls -G > /dev/null 2>&1; then
ls_color=cli
else
ls_color=
fi
fi
# Absolute path to `ls`.
-ls_path=`which ls`
+ls_path=`installed_path ls`
# GNU ls with colors.
if test "x$ls_color" = xgnu; then
ls_env=
@@ -83,14 +98,32 @@ else
ls_env=
ls_color=
fi
+
+# Also check if `column -t` is available.
+if echo test | column -t >/dev/null 2>&1; then
+ column=' | column -t'
+else
+ column=
+fi
+
generate perl shell/aliases \
-e 'while () {
s/\bLS_ENV\b/$ARGV[0]/;
s/\bLS_PATH\b/$ARGV[1]/;
s/\bLS_COLOR\b/$ARGV[2]/;
+ s/\bCOLUMN\b/$ARGV[3]/;
print;
}' \
- "$ls_env" "$ls_path" "$ls_color"
+ "$ls_env" "$ls_path" "$ls_color" "$column"
+
+# Check if grep supports --color=auto.
+if echo test | grep --color=auto test >/dev/null 2>&1; then
+ :
+else
+ echo 'shell/aliases: removing grep --color=auto'
+ sed '/^alias grep=/ s/^/#/' shell/aliases > shell/aliases.tmp
+ mv shell/aliases.tmp shell/aliases
+fi
generate cat screenrc .in
# As screen-256color is not widely supported use it only on machines where the
@@ -109,7 +142,7 @@ if terminal_available screen-256color; then
# rxvt-unicode binaries (e.g. Debian's rxvt-unicode-256color), the
# terminal_info check for manual installations which modify
# rxvt-unicode's terminfo entry.
- urxvt_path=`which urxvt`
+ urxvt_path=`installed_path urxvt`
urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-'`
if test x"$urxvt_grep" = 'xTERM=rxvt-unicode-256color' \
|| terminal_info rxvt-unicode \
@@ -192,11 +225,8 @@ fi
# Htop overwrites the comments in its configuration file.
generate cat htoprc .in
-# Copy remindrc template if ~/.reminders doesn't exist yet.
-if installed remind && test ! -e "$HOME/.reminders"; then
- echo remind: copying template to .reminders
- cp reminders.in "$HOME/.reminders"
-fi
+
+# LINK SETUP
# Link setup for shells.
link shell ~/.shell
@@ -213,6 +243,9 @@ link zsh/rc ~/.zshrc
link zsh/logout ~/.zlogout
# Link setup for additional files.
+if installed crontab; then
+ link crontab.d ~/.crontab.d
+fi
link lessfilter ~/.lessfilter
if installed colordiff; then
link colordiffrc ~/.colordiffrc
@@ -224,7 +257,8 @@ if installed tmux; then
fi
if installed htop; then
link htoprc ~/.htoprc
+ # New location for htoprc. Use both for compatibility.
+ mkdir -p ~/.config/htop
+ link htoprc ~/.config/htop/htoprc
fi
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap