Do not hardcode /bin/bash

Bash location is different from /bin on most non-Linux UNIX systems.
Rely on env(1) to find the shell in the user's $PATH.

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/override-scripts/git-extract.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # For test purposes only, this script would ordinarily run a git checkout, but here
 # it's going to generate a directory structure by copying some other fixture.

spec/octocatalog-diff/tests/bootstrap_spec.rb

@@ -71,10 +71,11 @@ describe OctocatalogDiff::Bootstrap do
       end
 
       it 'should execute bootstrap script with PATH matching environment' do
-        ENV['PATH'] = @d + '/adslfk'
+        old_path = ENV['PATH']
+        ENV['PATH'] = "#{old_path}:#{@d + '/adslfk'}"
         result = b(path: @d, bootstrap_script: 'script/bootstrap.sh', bootstrap_args: 'PATH')
         expect(result[:status_code]).to eq(32)
-        expect(result[:output].strip).to eq(@d + '/adslfk')
+        expect(result[:output].strip).to eq("#{old_path}:#{@d + '/adslfk'}")
       end
 
       it 'should execute bootstrap script with BASEDIR matching argument' do

spec/octocatalog-diff/tests/spec_helper.rb

@@ -183,7 +183,7 @@ module OctocatalogDiff
       temp_repo_dir = Dir.mktmpdir
       Dir.mkdir(File.join(temp_repo_dir, 'script'))
       File.open(File.join(temp_repo_dir, 'script', filename), 'w') do |f|
-        f.write "#!/bin/bash\n"
+        f.write "#!/usr/bin/env bash\n"
         f.write "var=\"${@: -1}\"\n"
         f.write "if [ \"$var\" = \"\" ]; then exit 31; fi\n"
         f.write "eval answer=\\$$var\n"