From: Simon Ruderich Date: Tue, 22 Oct 2013 19:05:09 +0000 (+0200) Subject: setup.sh: Quote arguments to echo. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4c6c14ab6bef478138a3a659cf59776f31ccd407;hp=d30e0e8afa67eeb9f7163c71bbd6bc568ad5e1b6;p=config%2Fdotfiles.git setup.sh: Quote arguments to echo. --- diff --git a/setup.sh b/setup.sh index 370bf5c..d7d0cbd 100755 --- 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 () { s/\bHISTORY_PATH\b/$ARGV[0]/; @@ -165,33 +165,33 @@ 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 @@ -213,13 +213,13 @@ 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