Change shebang to env

Move parameters from shebang back into set.
Add set -e to setenv and vstool for consistency.

scripts/build

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 # Ensure we are in root directory
 if [[ $(uname) == "Darwin" ]]; then

scripts/build-appimage

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 echo -e "\033[0;36mBuilding AppImage for OpenRCT2...\033[0m"
 

scripts/build-installer

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 if [[ "$#" -gt 2 || "$1" == "-h" ]]; then
     echo 'Create a Windows installer for OpenRCT2'

scripts/build-portable

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]]; then
     # Create a Windows symbols archive for OpenRCT2

scripts/build-symbols

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 # Check 7z or zip is available
 if [ -x "$(command -v 7z)" ]; then

scripts/check-code-formatting

@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/usr/bin/env sh
+
+set -e
 
 readlink_bin='readlink'
 

scripts/create-macos-universal

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 echo "Creating macOS universal app bundle"
 # create app skeleton

scripts/get-discord-rpc

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 if [[ $(uname) == "Linux" ]]; then
     basedir="$(readlink -f `dirname $0`/..)"

scripts/install-nsis

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 if [[ "$#" -ne 0 && "$#" -ne 2 ]]; then
     echo 'Install a portable version of NSIS which can build the OpenRCT2 Windows installer.'

scripts/linux/build-appimage-docker.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+
+set -ex
 
 REPO_ROOT=$(readlink -f $(dirname "$0")/../..)
 

scripts/linux/build-appimage.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+
+set -ex
 
 # use RAM disk if possible
 if [ -z "$CI" ] && [ -d /dev/shm ]; then

scripts/run-testpaint

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 # Ensure we are in root directory
 basedir="$(readlink -f `dirname $0`/..)"

scripts/run-tests

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 # Ensure we are in root directory
 if [[ $(uname) == "Darwin" ]]; then

scripts/setenv

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -e
 
 # This sets up more environment variables using the existing environment
 # It should be dot sourced into your environment

scripts/upload-backtrace-symbols

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 if [[ "$#" -ne 1 ]]; then
     echo 'Upload OpenRCT2 debug symbols to https://backtrace.io.'

scripts/upload-build

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 if [[ "$#" -ne 4 && "$#" -ne 5 ]]; then
     echo 'Upload an OpenRCT2 build to openrct2.org.'

scripts/vstool

@@ -1,3 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -e
 
 vstool.cmd $@