Merge remote-tracking branch 'smortex/portability-fixes' into 1-5-4

Author: kpaulisse

examples/script-overrides/git-extract-submodules/git-extract.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called from lib/octocatalog-diff/catalog-util/git.rb and is used to
 # archive and extract a certain branch of a git repository into a target directory.

script/fmt

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 RUBOCOP_YML="${DIR}/.rubocop.yml"

script/git-pre-commit

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is being invoked via <root dir>/.git/hooks, hence the
 # base directory is up two levels, not just one.

script/octocatalog-diff-wrapper

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script exists to make it easier to test alternate branches of octocatalog-diff.
 # It is intended as a one-for-one replacement of `octocatalog-diff` as installed by the gem.

script/puppet

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 

scripts/env/env.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script echoes back the environment. This is used for spec testing
 # and possible debugging.

scripts/git-extract/git-extract.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script is called from lib/octocatalog-diff/catalog-util/git.rb and is used to
 # archive and extract a certain branch of a git repository into a target directory.

scripts/puppet/puppet.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Script to run Puppet. The default implementation here is simply to pass
 # through the command line arguments (which are likely to be numerous when

spec/octocatalog-diff/fixtures/configs/trivial-enc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # The simplest and least functional ENC you'll ever see
 echo '---'