Bring more shell syntax into shellcheck compliance

**Bring executables into better shellcheck compliance**

While evaluating linting and testing options for our shell
configuration, a run of Shellcheck against our executables turned up
some places where we could use more consistent syntax across our
executables, such as always using a shebang or quoting `$HOME` when we
build up a larger directory.

**Update syntax for zsh functions and completions**

A few changes found while linting zsh configs with shellcheck:

* thoughtbot's [style guide] [guide] calls for `$(..)` over backticks
  when capturing command output
* use `-gt` to test array length in arguments

[guide]: https://github.com/thoughtbot/guides/tree/master/best-practices
This commit is contained in:
Geoff Harcourt 2015-10-30 12:50:02 -04:00
parent 31a8dd34f0
commit 21830dd035
7 changed files with 13 additions and 11 deletions

View file

@ -1 +1,3 @@
git commit --amend -v --date=$(date +%Y-%m-%dT%H:%M:%S)
#!/bin/sh
git commit --amend -v --date="$(date +%Y-%m-%dT%H:%M:%S)"

View file

@ -9,4 +9,4 @@ shift
replace_with="$1"
shift
ag -l --nocolor "$find_this" $* | xargs sed -i '' "s/$find_this/$replace_with/g"
ag -l --nocolor "$find_this" "$@" | xargs sed -i '' "s/$find_this/$replace_with/g"

View file

@ -3,7 +3,7 @@
set -e
PATH="/usr/local/bin:$PATH"
dir="`git rev-parse --git-dir`"
dir="$(git rev-parse --git-dir)"
trap 'rm -f "$dir/$$.tags"' EXIT
git ls-files | \
"${CTAGS:-ctags}" --tag-relative -L - -f"$dir/$$.tags" --languages=-javascript,sql

View file

@ -1,12 +1,12 @@
#!/bin/bash
touch $HOME/.psqlrc.local
touch "$HOME"/.psqlrc.local
if [ ! -e $HOME/.vim/autoload/plug.vim ]; then
curl -fLo $HOME/.vim/autoload/plug.vim --create-dirs \
if [ ! -e "$HOME"/.vim/autoload/plug.vim ]; then
curl -fLo "$HOME"/.vim/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
fi
vim -u $HOME/.vimrc.bundles +PlugInstall +PlugClean! +qa
vim -u "$HOME"/.vimrc.bundles +PlugInstall +PlugClean! +qa
# detect old OS X broken /etc/zshenv and suggest rename
if grep -qw path_helper /etc/zshenv 2>/dev/null; then

View file

@ -1,3 +1,3 @@
#compdef rspec
compadd -P spec/ `ls spec/**/*_spec.rb | sed -E "s/spec\///g"`
compadd -P spec/ $(ls spec/**/*_spec.rb | sed -E "s/spec\///g")

View file

@ -2,7 +2,7 @@
function envup() {
if [ -f .env ]; then
export `cat .env`
export $(cat .env)
else
echo 'No .env file found' 1>&2
return 1

View file

@ -1,8 +1,8 @@
# No arguments: `git status`
# With arguments: acts like `git`
g() {
if [[ $# > 0 ]]; then
git $@
if [[ $# -gt 0 ]]; then
git "$@"
else
git status
fi