Merge pull request #64 from caarlos0/zsh

shellcheck doesnt support zsh anymore, working around

.rultor.yml

@@ -5,4 +5,4 @@ install:
     - git submodule update
     - locale
     - ./build/install.sh
-    - ./build.sh
+    - ./build/build.sh

.travis.yml

@@ -2,6 +2,6 @@ language: bash
 install:
   - ./build/install.sh
 script:
-  - ./build.sh
+  - ./build/build.sh
 notifications:
   email: false

README.md

@@ -130,6 +130,10 @@ If you're brand-new to the project and run into any blockers, please
 [open an issue](https://github.com/caarlos0/dotfiles/issues) on this repository
 and I'd love to get it fixed for you!
 
+## known issues
+
+- All SC2039 ignores should be fixed (#65);
+
 ## contributing
 
 Feel free to contribute. Pull requests will be automatically

antigen/install.sh

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 touch ~/.z

antigen/path.zsh

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 source "$ZSH/antigen/antigen/antigen.zsh"

atom.symlink/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" = "Darwin" ] && brew cask install atom
 apm install \
   editorconfig autocomplete-plus \

bin/dot

@@ -1,18 +1,19 @@
-#!/bin/zsh
+#!/bin/sh
 #
 # dot
 #
 # `dot` handles installation, updates, things like that. Run it periodically
 # to make sure you're on the latest and greatest.
 main() {
   cd ~/.dotfiles
+  # shellcheck disable=SC2155
   export ZSH="$(pwd)"
   echo "Updating dotfiles..."
   git pull origin master
 
   echo "Updating antigen plugins..."
   git submodule update
-  source ./antigen/antigen/antigen.zsh
+  . ./antigen/antigen/antigen.zsh
   antigen apply
   antigen update
 

bin/e

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 #
 # Quick shortcut to an editor.
 #

bin/git-add-rm-line-count

@@ -1,9 +1,10 @@
 #!/bin/bash
 set -eo pipefail
 add_rm_lc() {
-  local diff_result=$(git diff)
-  local added=$(echo "$diff_result" | grep -c '^+')
-  local deleted=$(echo "$diff_result" | grep -c '^-')
+  local diff_result added deleted
+  diff_result=$(git diff)
+  added=$(echo "$diff_result" | grep -c '^+')
+  deleted=$(echo "$diff_result" | grep -c '^-')
   echo "${added} additions and ${deleted} deletions."
 }
 add_rm_lc "$@"

bin/killport

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 kill -9 "$(lsof -i tcp:"$1" | head -n 2 | tail -n 1 | awk '{print $2}')"

bin/lsopenports

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 lsof -i -n -P

docker/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 if [ "$(uname -s)" = "Darwin" ]; then
   brew cask install kitematic
 fi

docker/path.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 reload-docker() {
   eval "$(docker-machine env dev)"
 }

functions/c

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 cd "$PROJECTS/$1"

functions/d

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 cd "$ZSH/$1"

functions/extract

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 # credit: http://nparikh.org/notes/zshrc.txt
 # Usage: extract <file>
 # Description: extracts archived files / mounts disk images
@@ -25,4 +25,3 @@ extract () {
         echo "'$1' is not a valid file"
     fi
 }
-

functions/h

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 cd "$HOME/$1"

functions/server

@@ -1,5 +1,5 @@
-#!/bin/zsh
-function server {
+#!/bin/sh
+server() {
   local port="${1-8000}"
   python -m SimpleHTTPServer "$port" &
   open "http://localhost:$port"

git/aliases.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 alias gl='git pull --prune'
 alias glg="git log --graph --decorate --oneline --abbrev-commit"
 alias gp='git push origin HEAD'

git/install.sh

@@ -1,3 +1,3 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" != "Darwin" ] && return 0
 brew install git

golang/install.sh

@@ -1,3 +1,3 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" != "Darwin" ] && return 0
 brew install go

golang/path.zsh

@@ -1,3 +1,3 @@
-#!/bin/zsh
+#!/bin/sh
 export GOPATH="$PROJECTS/Go"
 [ ! -d "$GOPATH" ] &&  mkdir -p "$GOPATH"

homebrew/aliases.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 brewbump() {
   brew update
   brew upgrade --all

homebrew/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 #
 # Homebrew
 #

java/aliases.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 
 mvn() {
   # shellcheck disable=SC2068

java/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" != "Darwin" ] && return 0
 
 # install some java stuff

java/path.zsh

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 export MAVEN_OPTS="-Xmx1024m"

node/aliases.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 alias npis='npm install --save'
 alias npisd='npm install --save-dev'
 alias npig='npm install -g'

node/install.sh

@@ -1,3 +1,3 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" != "Darwin" ] && return 0
 brew install node

node/path.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 export PATH="/usr/local/share/npm/bin:$PATH"
 export PATH="$PATH:$HOME/.npm/bin"
 

postgres/path.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
-if [[ "$(uname -s)" = "Darwin" ]]; then
+#!/bin/sh
+if [ "$(uname -s)" = "Darwin" ]; then
   export PATH=$PATH:/Applications/Postgres.app/Contents/Versions/9.4/bin
 fi

ruby/aliases.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 alias migrate='rake db:migrate'
 alias fs='bundle exec foreman start'
 alias fsdev='bundle exec foreman start -f Procfile.dev'

ruby/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" != "Darwin" ] && return 0
 
 if test ! "$(which rbenv)"; then

ruby/path.zsh

@@ -1,7 +1,8 @@
-#!/bin/zsh
+#!/bin/sh
 if [ -d "$HOME/.rbenv" ]; then
   export PATH="$HOME/.rbenv/bin:$PATH"
 fi
+# shellcheck disable=SC2039
 if rbenv &>/dev/null; then
   eval "$(rbenv init -)"
 fi

ruby/rbenv.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 # rehash shims
 rbenv rehash 2>/dev/null
 

script/bootstrap

@@ -65,7 +65,7 @@ link_file () {
 
     if [ "$overwrite_all" == "false" ] && [ "$backup_all" == "false" ] && [ "$skip_all" == "false" ]
     then
-      # shellcheck disable=SC2086
+      # shellcheck disable=SC2086,SC2155
       local currentSrc="$(readlink $dst)"
 
       if [ "$currentSrc" == "$src" ]

slate/install.sh

@@ -1,3 +1,3 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" != "Darwin" ] && return 0
 brew cask install slate

ssh/aliases.zsh

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to pasteboard.'"

sublime-text-3/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 
 if [ "$(uname -s)" = "Darwin" ]; then
   brew cask install sublime-text3

system/aliases.zsh

@@ -1,7 +1,8 @@
-#!/bin/zsh
+#!/bin/sh
 # grc overides for ls
 #   Made possible through contributions from generous benefactors like
 #   `brew install coreutils`
+# shellcheck disable=SC2039
 if gls &>/dev/null; then
   alias ls="gls -F --color"
   alias l="gls -lAh --color"
@@ -17,17 +18,17 @@ alias grep="grep --color=auto"
 alias duf="du -sh * | sort -hr"
 alias less="less -r"
 
-if [[ -z $(command -v pbcopy) ]]; then
-  if [[ -n $(command -v xclip) ]]; then
+if [ -z "$(command -v pbcopy)" ]; then
+  if [ -n "$(command -v xclip)" ]; then
     alias pbcopy="xclip -selection clipboard"
     alias pbpaste="xclip -selection clipboard -o"
-  elif [[ -n $(command -v xsel) ]]; then
+  elif [ -n "$(command -v xsel)" ]; then
     alias pbcopy="xsel --clipboard --input"
     alias pbpaste="xsel --clipboard --output"
   fi
 fi
 
-if [[ "$(uname -s)" != "Darwin" ]]; then
+if [ "$(uname -s)" != "Darwin" ]; then
   if [ -e /usr/bin/xdg-open ]; then
     alias open="xdg-open"
   fi

system/env.zsh

@@ -1,2 +1,2 @@
-#!/bin/zsh
+#!/bin/sh
 export EDITOR='atom'

system/grc.zsh

@@ -1,5 +1,6 @@
-#!/bin/zsh
+#!/bin/sh
 # GRC colorizes nifty unix tools all over the place
+# shellcheck disable=2039
 if grc &>/dev/null && ! brew &>/dev/null; then
-  source "$(brew --prefix)/etc/grc.bashrc"
+  . "$(brew --prefix)/etc/grc.bashrc"
 fi

system/path.zsh

@@ -1,3 +1,3 @@
-#!/bin/zsh
+#!/bin/sh
 export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"

terminator/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 [ "$(uname -s)" = "Darwin" ] && return 0
 mkdir -p ~/.config/terminator/
 ln -sf "$ZSH"/terminator/base16-ocean-dark.config ~/.config/terminator/config

vim/install.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 setup_command_t() {
   cd "$ZSH"/vim/vimfiles/vim.symlink/bundle/command-t/ruby/command-t
   ruby extconf.rb

zsh/aliases.zsh

@@ -1,7 +1,7 @@
-#!/bin/zsh
+#!/bin/sh
 __reload_dotfiles() {
-  export PATH="$(command -p getconf PATH)"
-  source ~/.zshrc
+  PATH="$(command -p getconf PATH)"
+  . ~/.zshrc
   cd .
 }
 alias reload!='__reload_dotfiles'

zsh/completion.zsh

@@ -1,8 +1,8 @@
 #!/bin/zsh
 # Force rehash when command not found
 _force_rehash() {
-    (( CURRENT == 1 )) && rehash
-    return 1
+  (( CURRENT == 1 )) && rehash
+  return 1
 }
 
 # forces zsh to realize new commands

zsh/window.zsh

@@ -1,7 +1,7 @@
-#!/bin/zsh
+#!/bin/sh
 # From http://dotfiles.org/~_why/.zshrc
 # Sets the window title nicely no matter where you are
-function title() {
+title() {
   # escape '%' chars in $1, make nonprintables visible
   a=${(V)1//\%/\%\%}