X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=243dce9392647f31feec712ecbece2da9f903820;hb=44b2d1be3a927212884c91d2bfe199bcea4f1c92;hp=d7d0cbdfe039099c9dd987ddd30cc8764bef08ed;hpb=4c6c14ab6bef478138a3a659cf59776f31ccd407;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index d7d0cbd..243dce9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -30,9 +30,6 @@ terminal_info() {
 terminal_available() {
     terminal_info "$@" > /dev/null
 }
-grep_i() {
-    cmd_i grep "$@"
-}
 # Check if `infocmp` is available.
 if ! infocmp >/dev/null 2>&1; then
     echo 'Warning: `infocmp` not available! 256color checks will fail.'
@@ -59,12 +56,8 @@ mkdir -p zsh/cache
 # 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" \
+simple_cpp <lesskey \
+    HISTORY_PATH -- "`pwd`/lesshistory" \
     | lesskey -
 chmod 0600 ~/.less
 
@@ -111,14 +104,8 @@ else
     column=
 fi
 
-generate perl shell/aliases \
-    -e 'while (<STDIN>) {
-            s/\bLS_ENV\b/$ARGV[0]/;
-            s/\bLS_PATH\b/$ARGV[1]/;
-            s/\bLS_COLOR\b/$ARGV[2]/;
-            s/\bCOLUMN\b/$ARGV[3]/;
-            print;
-        }' \
+generate shell/aliases .in simple_cpp \
+    LS_ENV LS_PATH LS_COLOR COLUMN -- \
     "$ls_env" "$ls_path" "$ls_color" "$column"
 
 # If `tig` is not available use my simple replacement.
@@ -134,7 +121,7 @@ else
     sed_i '/^alias grep=/ s/^/#/' shell/aliases
 fi
 
-generate cat screenrc .in
+generate screenrc .in cat
 # 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
 # which supports 256 colors. Also used for tmux.
@@ -196,20 +183,15 @@ if test ! -d /sys/class/power_supply/BAT0; then
 fi
 
 if installed tmux; then
-    generate perl tmux.conf ./bin/remove-continuation.pl
+    generate tmux.conf .in perl ./bin/remove-continuation.pl
 
     # Add mappings to switch to windows 10-29 quickly. See tmux-window.pl for
     # details.
     perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" >tmux-window1.conf
     perl ./tmux-window.pl 2                           >tmux-window2.conf
     # Set absolute path to tmux-window1.conf in tmux.conf.
-    perl <tmux.conf >tmux.conf.tmp \
-        -e 'while (<STDIN>) {
-                s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
-                print;
-            }' \
-        "`pwd`/tmux-window1.conf"
-    mv tmux.conf.tmp tmux.conf
+    generate tmux.conf '' simple_cpp \
+        TMUX_WINDOW_PATH -- "`pwd`/tmux-window1.conf"
 
     # 256 colors not available.
     if test -z "$use_256colors"; then
@@ -225,7 +207,7 @@ if installed tmux; then
 fi
 
 # Htop overwrites the comments in its configuration file.
-generate cat htoprc .in
+generate htoprc .in cat
 
 
 # LINK SETUP