Merge pull request #4271 from hashicorp/build-system-linux-compat

Build system linux compat

build-support/functions/00-vars.sh

@@ -32,10 +32,8 @@ CONSUL_PKG_NAME="consul"
 if test "$(uname)" == "Darwin"
 then
    SED_EXT="-E"
-   alias sed_i="sed -i ''"
 else
-   SED_EXT=""
-   alias sed_i="sed -i"
+   SED_EXT="-r"
 fi
 
 CONSUL_BINARY_TYPE=oss

build-support/functions/10-util.sh

@@ -58,6 +58,17 @@ function debug {
    fi
 }
 
+function sed_i {
+   if test "$(uname)" == "Darwin"
+   then
+      sed -i '' "$@"
+      return $?
+   else
+      sed -i "$@"
+      return $?
+   fi
+}
+
 function is_set {
    # Arguments:
    #   $1 - string value to check its truthiness