X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=setup.sh;h=4c14f5f4abcff775dd02bb44bd3344846ddfb4d1;hb=0250848fa42b8bfe9396619bb91d94acddf942f8;hp=a5af86b2e6321ab8848fd09582693fac2dee550c;hpb=3f5d80c3a9142c424ca2c482b6ad28c475349d42;p=config%2Fdotfiles.git
diff --git a/setup.sh b/setup.sh
index a5af86b..4c14f5f 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,13 +36,32 @@ 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
-# Generate ~/.less with lesskey.
-lesskey lesskey
+# 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.
+echo lesskey: generating .lesskey
+perl < lesskey \
+ -e 'while () {
+ s/\bHISTORY_PATH\b/$ARGV[0]/;
+ print;
+ }' \
+ "`pwd`/lesshistory" \
+ | lesskey -
chmod 0600 ~/.less
# Find the required options to get colored ls output. GNU ls is preferred. See
@@ -83,6 +104,15 @@ generate perl shell/aliases \
}' \
"$ls_env" "$ls_path" "$ls_color"
+# 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
# matching terminfo entry is available. This also requires a terminal emulator
@@ -189,6 +219,9 @@ if installed remind && test ! -e "$HOME/.reminders"; then
cp reminders.in "$HOME/.reminders"
fi
+
+# LINK SETUP
+
# Link setup for shells.
link shell ~/.shell
link bash ~/.bash
@@ -204,6 +237,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
@@ -215,7 +251,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