setup.sh: Use new generate() argument order.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 370bf5c0f7006a708ddf7fe1dce564b2d0fd54cd..bb2e4c0dbe1865a93463d9fb3fc12280ac71f162 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -58,7 +58,7 @@ mkdir -p zsh/cache
 # 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
+echo 'lesskey: generating .lesskey'
 perl < lesskey \
     -e 'while (<STDIN>) {
             s/\bHISTORY_PATH\b/$ARGV[0]/;
@@ -111,7 +111,7 @@ else
     column=
 fi
 
-generate perl shell/aliases \
+generate shell/aliases .in perl \
     -e 'while (<STDIN>) {
             s/\bLS_ENV\b/$ARGV[0]/;
             s/\bLS_PATH\b/$ARGV[1]/;
@@ -134,7 +134,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.
@@ -165,38 +165,38 @@ if terminal_available screen-256color; then
     fi
 fi
 if test -z "$use_256colors"; then
-    echo screenrc: removing 256 colors
+    echo 'screenrc: removing 256 colors'
     sed_i 's/Enable 256 color/Disable 256 color/;
            s/screen-256color/screen/' screenrc
 fi
 # Some options are only necessary when running as root. They are marked as
 # "(ROOT)".
 if test "`id -u`" -ne 0; then
-    echo screenrc: removing root options
+    echo 'screenrc: removing root options'
     grep_i -v '(ROOT)' screenrc
 fi
 # I use some features of GNU screen which are only in Git or very recent GNU
 # screen versions. Drop them on machines which have older versions. They are
 # marked as "(GIT)".
 if test ! -d "$HOME/development/shell/screen"; then
-    echo screenrc: removing Git features
+    echo 'screenrc: removing Git features'
     grep_i -v '(GIT)' screenrc
 fi
 # Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
 # it's installed.
 if installed rxvt; then
-    echo screenrc: removing attrcolor \"fix\"
+    echo 'screenrc: removing attrcolor "fix"'
     sed_i 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc
 fi
 # Display current battery charge on computers with a battery. Necessary lines
 # are marked as "(BATTERY)".
 if test ! -d /sys/class/power_supply/BAT0; then
-    echo screenrc: removing battery display
+    echo 'screenrc: removing battery display'
     grep_i -v '(BATTERY)' screenrc
 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.
@@ -213,19 +213,19 @@ if installed tmux; then
 
     # 256 colors not available.
     if test -z "$use_256colors"; then
-        echo tmux.conf: removing 256 colors
+        echo 'tmux.conf: removing 256 colors'
         sed_i 's/Enable 256 color/Disable 256 color/;
                s/screen-256color/screen/' tmux.conf
     fi
     # Tmux doesn't display a warning if the shell wasn't found!
     if test ! -x '/bin/zsh'; then
-        echo tmux.conf: removing /bin/zsh as shell
+        echo 'tmux.conf: removing /bin/zsh as shell'
         sed_i 's/zsh/sh/' tmux.conf
     fi
 fi
 
 # Htop overwrites the comments in its configuration file.
-generate cat htoprc .in
+generate htoprc .in cat
 
 
 # LINK SETUP