Merge pull request #321 from rnhurt/master

Make stack-diff output prettier

Author: mbailey

README.md

@@ -148,6 +148,11 @@ postgres02  DELETE_COMPLETE  2011-05-23T15:47:44Z  NEVER_UPDATED  NOT_NESTED
 * [bash](https://www.gnu.org/software/bash/)
 * [jq-1.4](http://stedolan.github.io/jq/download/) or later (for stack-diff)
 
+### Optional Packages
+
+* [colordiff](https://www.colordiff.org/) to show stack-diff in color
+* [icdiff](https://github.com/jeffkaufman/icdiff) to show stack-diff in color and side-by-side
+
 ### Installation
 
 As shown below, you may simply clone the GitHub repo and source the files required.

lib/stack-functions

@@ -840,7 +840,9 @@ _bma_stack_diff_template() {
   if ! aws cloudformation describe-stacks --stack-name "$stack" 1>/dev/null; then
     return 1;
   fi
-  if [ "x$( type -P colordiff )" != "x" ]; then
+  if command -v icdiff; then
+    local DIFF_CMD=icdiff
+  elif command -v colordiff; then
     local DIFF_CMD=colordiff
   else
     local DIFF_CMD=diff
@@ -876,7 +878,9 @@ _bma_stack_diff_params() {
   if [ ! -f "$params" ]; then
     return 1
   fi
-  if [ "x$( type -P colordiff )" != "x" ]; then
+  if command -v icdiff; then
+    local DIFF_CMD=icdiff
+  elif command -v colordiff; then
     local DIFF_CMD=colordiff
   else
     local DIFF_CMD=diff