X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=be42a6a017f0ed89b24b48cb5e42f95f10d6ade2;hb=01837f58b576a29c8ac23058b97d0a71821258a6;hp=a5af86b2e6321ab8848fd09582693fac2dee550c;hpb=3f5d80c3a9142c424ca2c482b6ad28c475349d42;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index a5af86b..be42a6a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
 # Helper functions.
@@ -34,13 +36,30 @@ 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
+
+
+# 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 (<STDIN>) {
+            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
@@ -189,6 +208,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 +226,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 +240,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