From: Simon Ruderich Date: Mon, 9 Jun 2014 12:37:53 +0000 (+0200) Subject: zsh/rc: remove unnecessary quotes X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=a142702ea1e1357bffced5f1417fba96186302bc zsh/rc: remove unnecessary quotes --- diff --git a/zsh/rc b/zsh/rc index 96b45e4..666f40e 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,6 +1,6 @@ # Zsh configuration file. -# Copyright (C) 2011-2013 Simon Ruderich +# Copyright (C) 2011-2014 Simon Ruderich # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,12 +35,12 @@ zshrc_resolve_fg_to_resumed_job_name() { # Replace fg with the resumed job name. if [[ $1 == fg ]]; then - REPLY="${jobtexts[%+]}" + REPLY=${jobtexts[%+]} elif [[ $1 == fg\ * ]]; then - REPLY="${jobtexts[${1#fg }]}" + REPLY=${jobtexts[${1#fg }]} # Normal program, return as is. else - REPLY="$1" + REPLY=$1 fi } @@ -276,7 +276,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) || +vi-pre-get-data() { # Only Git and Mercurial support and need caching. Abort if any other # VCS is used. - [[ "$vcs" != git && "$vcs" != hg ]] && return + [[ $vcs != git && $vcs != hg ]] && return # If the shell just started up or we changed directories (or for other # custom reasons) we must run vcs_info. @@ -289,7 +289,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) || ret=1 # If a git/hg command was run then run vcs_info as the status might # need to be updated. - case "$(fc -ln $(($HISTCMD-1)))" in + case $(fc -ln $(($HISTCMD-1))) in git* | g\ *) ret=0 ;; @@ -336,12 +336,12 @@ zshrc_longrun_data=() # Display runtime in seconds for long running programs (> 60 seconds) and send # a bell to notify me. zshrc_longrun_preexec() { - local program="$3" + local program=$3 # Handle fg. local REPLY - zshrc_resolve_fg_to_resumed_job_name "$program" - program="$REPLY" + zshrc_resolve_fg_to_resumed_job_name $program + program=$REPLY # Don't track the time for certain (possible) long running processes which # need no automatic notification. @@ -354,7 +354,7 @@ zshrc_longrun_preexec() { esac done - zshrc_longrun_data=("$program" $EPOCHSECONDS) + zshrc_longrun_data=($program $EPOCHSECONDS) } zshrc_longrun_precmd() { # No previous timestamp available or disabled for this command, ignore. @@ -410,10 +410,10 @@ zshrc_prompt_precmd() { local directory="${yellow}%WIDTH<..<%~%<<${default}" # Minimal information about the VCS, only displayed if there are # unstaged/staged changes. - local vcs_staged="${vcs_info_msg_1_}" + local vcs_staged=${vcs_info_msg_1_} # Information about the VCS in this directory. - local vcs="${vcs_info_msg_0_}" + local vcs=${vcs_info_msg_0_} # Current time (seconds since epoch) in Hex in bright blue. local seconds="${blue}%B0x$(([##16] EPOCHSECONDS))%b${default}" @@ -439,7 +439,7 @@ zshrc_prompt_precmd() { # Combine them to create the prompt. - local top_left="${vcs_staged}" + local top_left=${vcs_staged} local top_right="${vcs}(${seconds})" local width_top_prefix=${#${(S%%)top_prefix//$~zero/}} @@ -508,8 +508,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then # Handle fg. local REPLY - zshrc_resolve_fg_to_resumed_job_name "$program_name" - program_name="$REPLY" + zshrc_resolve_fg_to_resumed_job_name $program_name + program_name=$REPLY # Remove all arguments from the program name. program_name=${program_name%% *} @@ -563,7 +563,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then fi # Set the window name to the currently running program. - zshrc_window_title "$program_name" + zshrc_window_title $program_name # Tell precmd() to reset the window name when the program stops. zshrc_window_reset=yes @@ -798,7 +798,7 @@ compdef svalgrind=valgrind TRAPINT() { # Don't store this line in history if histignorespace is enabled and the # line starts with a space. - if [[ -o histignorespace && ${BUFFER[1]} = " " ]]; then + if [[ -o histignorespace && ${BUFFER[1]} = ' ' ]]; then return $1 fi