Merge branch 'next' of github.com:so-fancy/diff-so-fancy into next

Author: scottchiefbaker

.travis.yml

@@ -13,17 +13,22 @@ perl:
 matrix:
   include:
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode9.4
       language: generic
       perl: 5.24
   allow_failures:
     - perl: "blead"
 
+addons:
+  homebrew:
+    packages:
+      - perl
+      - shellcheck
+      - cpanminus
+
 before_install:
   - git clone --depth 1 https://github.com/sstephenson/bats.git
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew update;
-      brew install shellcheck perl cpanminus;
       mkdir -p ~/perl5;
     fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

README.md

@@ -1,6 +1,6 @@
 # diff-so-fancy  [![Circle CI build](https://circleci.com/gh/so-fancy/diff-so-fancy.svg?style=shield)](https://circleci.com/gh/so-fancy/diff-so-fancy) [![TravisCI build](https://travis-ci.org/so-fancy/diff-so-fancy.svg?branch=master)](https://travis-ci.org/so-fancy/diff-so-fancy) [![AppVeyor build](https://ci.appveyor.com/api/projects/status/github/so-fancy/diff-so-fancy?branch=master&svg=true)](https://ci.appveyor.com/project/stevemao/diff-so-fancy/branch/master)
 
-`diff-so-fancy` strives to make your diff's **human** readable instead of machine readable. This helps improve code quality and help you spot defects faster.
+`diff-so-fancy` strives to make your diffs **human** readable instead of machine readable. This helps improve code quality and helps you spot defects faster.
 
 
 ## Screenshot
@@ -11,21 +11,23 @@ Vanilla `git diff` vs `git` and `diff-so-fancy`
 
 ## Install
 
-Installation is as simple as downloading the [diff-so-fancy](https://raw.githubusercontent.com/so-fancy/diff-so-fancy/master/third_party/build_fatpack/diff-so-fancy) script to a directory in your path.
+Installation is as simple as downloading the [`diff-so-fancy`](https://raw.githubusercontent.com/so-fancy/diff-so-fancy/master/third_party/build_fatpack/diff-so-fancy) script to a directory in your path.
 Windows users may need to install [MinGW](https://sourceforge.net/projects/mingw/files/) or the [Windows subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
 
 `diff-so-fancy` is also available from NPM, Nix, brew, and as a package on Arch Linux.
 
 ## Usage
 
 Configure git to use `diff-so-fancy` for all diff output:
+
 ```shell
 git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
 ```
 
 ### Improved colors for the highlighted bits
 
 The default Git colors are not optimal. The colors used for the screenshot above were:
+
 ```shell
 git config --global color.ui true
 
@@ -47,41 +49,46 @@ git config --global color.diff.whitespace "red reverse"
 ### markEmptyLines
 
 Should the first block of an empty line be colored. (Default: true)
+
 ```
 git config --bool --global diff-so-fancy.markEmptyLines false
 ```
 
 ### changeHunkIndicators
 
 Simplify git header chunks to a more human readable format. (Default: true)
+
 ```
 git config --bool --global diff-so-fancy.changeHunkIndicators false
 ```
 
 ### stripLeadingSymbols
 
 Should the pesky `+` or `-` at line-start be removed. (Default: true)
+
 ```
 git config --bool --global diff-so-fancy.stripLeadingSymbols false
 ```
 
 ### useUnicodeRuler
 
-By default the separator for the file header uses Unicode line drawing characters. If this is causing output errors on your terminal set this to `false` to use ASCII characters instead. (Default: true)
+By default, the separator for the file header uses Unicode line-drawing characters. If this is causing output errors on your terminal, set this to `false` to use ASCII characters instead. (Default: true)
+
 ```
 git config --bool --global diff-so-fancy.useUnicodeRuler false
 ```
 
 ### rulerWidth
 
-By default the separator for the file header spans the full width of the terminal. Use this setting to set the width of the file header manually.
+By default, the separator for the file header spans the full width of the terminal. Use this setting to set the width of the file header manually.
+
 ```
 git config --global diff-so-fancy.rulerWidth 47    # git log's commit header width
 ```
 
 ## Contributing
 
-Pull requests are quite welcome, and should target the [`next` branch](https://github.com/so-fancy/diff-so-fancy/tree/next). We are also looking for any feedback or ideas on how to make diff-so-fancy even *fancier*.
+Pull requests are quite welcome, and should target the [`next` branch](https://github.com/so-fancy/diff-so-fancy/tree/next). We are also looking for any feedback or ideas on how to make `diff-so-fancy` even *fancier*.
 
 ### Other documentation
 

report-bug.sh

@@ -23,12 +23,12 @@ clipboard() {
       copy_cmd=clip
     fi
     # copy_cmd=clip
-  elif which pbcopy >/dev/null 2>&1; then
+  elif command -v pbcopy >/dev/null 2>&1; then
     copy_cmd="pbcopy"
-  elif which xclip >/dev/null 2>&1; then
+  elif command -v xclip >/dev/null 2>&1; then
     # copy_cmd="xclip -i -selection clipboard"
     copy_cmd="xclip"
-  elif which xsel  >/dev/null 2>&1 ; then
+  elif command -v xsel >/dev/null 2>&1 ; then
     local copy_cmd="xsel -b"
   fi
   if [ -n "$copy_cmd" ] ;then