From 7c7300946148790cf185ae47452e072ae0d87c2a Mon Sep 17 00:00:00 2001
From: "tal@whatexit.org" <tal@whatexit.org>
Date: Tue, 4 Aug 2015 11:53:25 -0400
Subject: [PATCH] Improve Cygwin compatibility.

---
 bin/_blackbox_common.sh |  9 +++------
 bin/_stack_lib.sh       | 27 ++++++++++-----------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index 0c0e290..556024f 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -367,14 +367,11 @@ function md5sum_file() {
     Darwin )
       md5 -r "$1" | awk '{ print $1 }'
       ;;
-    Linux )
-      md5sum "$1" | awk '{ print $1 }'
-      ;;
-    CYGWIN* )
+    Linux | CYGWIN*)
       md5sum "$1" | awk '{ print $1 }'
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (md5sum_file)'
       exit 1
       ;;
   esac
@@ -390,7 +387,7 @@ function cp_permissions() {
       chmod --reference "$1" "${@:2}"
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (cp_permissions)'
       exit 1
       ;;
   esac
diff --git a/bin/_stack_lib.sh b/bin/_stack_lib.sh
index 93d67d3..3c4ad2c 100755
--- a/bin/_stack_lib.sh
+++ b/bin/_stack_lib.sh
@@ -57,11 +57,11 @@ function create_self_deleting_tempfile() {
       : ${TMPDIR:=/tmp} ;
       filename=$(mktemp -t _stacklib_.XXXXXXXX )
       ;;
-    Linux )
+    Linux | CYGWIN* )
       filename=$(mktemp)
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (create_self_deleting_tempfile)'
       exit 1
       ;;
   esac
@@ -78,11 +78,11 @@ function create_self_deleting_tempdir() {
       : ${TMPDIR:=/tmp} ;
       filename=$(mktemp -d -t _stacklib_ )
       ;;
-    Linux )
+    Linux | CYGWIN* )
       filename=$(mktemp -d)
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (create_self_deleting_tempdir)'
       exit 1
       ;;
   esac
@@ -102,11 +102,11 @@ function make_self_deleting_tempfile() {
       : ${TMPDIR:=/tmp} ;
       name=$(mktemp -t _stacklib_ )
       ;;
-    Linux )
+    Linux | CYGWIN* )
       name=$(mktemp)
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (make_self_deleting_tempfile)'
       exit 1
       ;;
   esac
@@ -124,11 +124,11 @@ function make_tempdir() {
       : ${TMPDIR:=/tmp} ;
       name=$(mktemp -d -t _stacklib_ )
       ;;
-    Linux )
+    Linux | CYGWIN* )
       name=$(mktemp -d)
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (make_tempdir)'
       exit 1
       ;;
   esac
@@ -164,14 +164,7 @@ function fail_if_in_root_directory() {
         exit 1
       fi
       ;;
-    Linux )
-      if [[ $(stat -c'%i' / ) == $(stat -c'%i' . ) ]] ; then
-        echo 'SECURITY ALERT: The current directory is the root directory.'
-        echo 'Exiting...'
-        exit 1
-      fi
-      ;;
-    CYGWIN* )
+    Linux | CYGWIN* )
       if [[ $(stat -c'%i' / ) == $(stat -c'%i' . ) ]] ; then
         echo 'SECURITY ALERT: The current directory is the root directory.'
         echo 'Exiting...'
@@ -179,7 +172,7 @@ function fail_if_in_root_directory() {
       fi
       ;;
     * )
-      echo 'ERROR: Unknown OS. Exiting.'
+      echo 'ERROR: Unknown OS. Exiting. (fail_if_in_root_directory)'
       exit 1
       ;;
   esac