From b3fa848f0fc8399712a1937037baefaa3feb163e Mon Sep 17 00:00:00 2001 From: Jookia Date: Fri, 9 Sep 2022 06:00:26 +1000 Subject: [PATCH] Replace '/bin/bash' with '/usr/bin/env bash' in shebangs This should hopefully help portability with BSDs. --- NOTES/Intel DIV behavior/xzview.sh | 2 +- autogen.sh | 2 +- avi_zmbv_to_720p.sh | 2 +- build | 2 +- build-debug | 2 +- build-debug-g3 | 2 +- build-debug-g3-sdl2 | 2 +- build-debug-gcc-prof | 2 +- build-debug-macos | 2 +- build-debug-macos-sdl2 | 2 +- build-debug-sdl2 | 2 +- build-debug-with-clang | 2 +- build-emscripten-sdl2 | 2 +- build-macos | 2 +- build-macos-sdl2 | 2 +- build-mingw | 2 +- build-mingw-hx-dos | 2 +- build-mingw-lowend | 2 +- build-mingw-lowend-sdl2 | 2 +- build-mingw-sdl2 | 2 +- build-mingw-sdldraw | 2 +- build-riscos | 2 +- build-scripts/macosx/make-macosx-build.sh | 2 +- build-scripts/mingw/make-mingw-hx-dos.sh | 2 +- build-scripts/mingw/make-mingw.sh | 2 +- build-sdl2 | 2 +- cleantree | 2 +- cleanup | 2 +- contrib/mappings/regenerate.sh | 2 +- dos2unix.sh | 2 +- env-gcc-4.8-rpi.sh | 2 +- env-gcc-4.8.sh | 2 +- env-gcc-8.3.sh | 2 +- env-gcc-8.4.sh | 2 +- env-gcc-9.2.sh | 2 +- env-gcc-9.3.sh | 2 +- git-pull-mainline.sh | 2 +- git-push-to-github.sh | 2 +- git-setup-sdl2-work.sh | 2 +- git-update-all | 2 +- git-update-all-wo-push | 2 +- make-flatpak.sh | 2 +- make-rpm.sh.in | 2 +- merge-dev-to-master.sh | 2 +- merge-to-win-ci | 2 +- mod2wav.sh | 2 +- mtavi2wav.sh | 2 +- mts_to_1080p.sh | 2 +- mts_to_2160p.sh | 2 +- mts_to_720p.sh | 2 +- scaleup-4x3-mp4-to-1080p.sh | 2 +- scaleup-4x3-mts-to-1080p.sh | 2 +- src/builtin/update-dsxmenu-pc98.sh | 2 +- src/builtin/update-dsxmenu.sh | 2 +- update-docs-site | 2 +- update-dosbox-x-reference-conf | 2 +- update-en-translation | 2 +- update-version-number | 2 +- vs/freetype/build-dosbox.sh | 2 +- vs/libpng/build-dosbox.sh | 2 +- vs/libpng/contrib/oss-fuzz/build.sh | 2 +- vs/sdl/build-dosbox.sh | 2 +- vs/sdl2/build-dosbox.sh | 2 +- vs/sdl2/build-scripts/androidbuild.sh | 2 +- vs/sdl2/build-scripts/checker-buildbot.sh | 2 +- vs/sdl2/build-scripts/emscripten-buildbot.sh | 2 +- vs/sdl2/build-scripts/nacl-buildbot.sh | 2 +- vs/sdl2/build-scripts/naclbuild.sh | 2 +- vs/sdl2/build-scripts/raspberrypi-buildbot.sh | 2 +- vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh | 2 +- vs/sdl2/src/hidapi/testgui/start.sh | 2 +- vs/sdl2/src/render/metal/build-metal-shaders.sh | 2 +- vs/sdlnet/build-dosbox.sh | 2 +- vs/zlib/build-dosbox.sh | 2 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/NOTES/Intel DIV behavior/xzview.sh b/NOTES/Intel DIV behavior/xzview.sh index 34a107a47e3..93137f33159 100755 --- a/NOTES/Intel DIV behavior/xzview.sh +++ b/NOTES/Intel DIV behavior/xzview.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash xz -c -d "$1" | less - diff --git a/autogen.sh b/autogen.sh index 50719b18fd1..c97392973eb 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # If an error occurs, quit the script and inform the user. This ensures scripts # like ./build-macos and ./build-macos-sdl2 etc. Don't continue on if Autotools isn't installed. diff --git a/avi_zmbv_to_720p.sh b/avi_zmbv_to_720p.sh index 62e754f83a8..0ac1d56c343 100755 --- a/avi_zmbv_to_720p.sh +++ b/avi_zmbv_to_720p.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash file="$1" bitrate=15000000 aspect_ratio=4:3 diff --git a/build b/build index 9f222c9f326..51160c8604b 100755 --- a/build +++ b/build @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-debug b/build-debug index 28423f01230..6c50b5f2ac4 100755 --- a/build-debug +++ b/build-debug @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # allow 32-bit on 64-bit (x86) builds if [ "$1" == "32" ]; then diff --git a/build-debug-g3 b/build-debug-g3 index 58131a1c48d..e0079eaa537 100755 --- a/build-debug-g3 +++ b/build-debug-g3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # allow 32-bit on 64-bit (x86) builds if [ "$1" == "32" ]; then diff --git a/build-debug-g3-sdl2 b/build-debug-g3-sdl2 index 27fe4346ee1..497760ab605 100755 --- a/build-debug-g3-sdl2 +++ b/build-debug-g3-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # allow 32-bit on 64-bit (x86) builds if [ "$1" == "32" ]; then diff --git a/build-debug-gcc-prof b/build-debug-gcc-prof index 0a0e11db39b..fd0db3e1760 100755 --- a/build-debug-gcc-prof +++ b/build-debug-gcc-prof @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # allow 32-bit on 64-bit (x86) builds if [ "$1" == "32" ]; then diff --git a/build-debug-macos b/build-debug-macos index b094d45d570..2d5ec8bf278 100755 --- a/build-debug-macos +++ b/build-debug-macos @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-debug-macos-sdl2 b/build-debug-macos-sdl2 index 30d07208362..d8c8a5182d7 100755 --- a/build-debug-macos-sdl2 +++ b/build-debug-macos-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-debug-sdl2 b/build-debug-sdl2 index e4b661e01b5..7a3e202dd45 100755 --- a/build-debug-sdl2 +++ b/build-debug-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # allow 32-bit on 64-bit (x86) builds if [ "$1" == "32" ]; then diff --git a/build-debug-with-clang b/build-debug-with-clang index 707d6d13f94..8ad61f380b7 100755 --- a/build-debug-with-clang +++ b/build-debug-with-clang @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Do you like Clang/LLVM? Use this script to build DOSBox-X! export CC=`which clang` diff --git a/build-emscripten-sdl2 b/build-emscripten-sdl2 index da9d99491af..33a76fbc9b8 100755 --- a/build-emscripten-sdl2 +++ b/build-emscripten-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # make sure you use ". ./emsdk_env.sh" diff --git a/build-macos b/build-macos index 0b21ba1ed33..7347d9092af 100755 --- a/build-macos +++ b/build-macos @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-macos-sdl2 b/build-macos-sdl2 index a8ef655db0e..552e6e5eb28 100755 --- a/build-macos-sdl2 +++ b/build-macos-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-mingw b/build-mingw index bcdee9fc8c7..b9ebfb867b8 100644 --- a/build-mingw +++ b/build-mingw @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-mingw-hx-dos b/build-mingw-hx-dos index aad037b1d18..3dc639aacfe 100644 --- a/build-mingw-hx-dos +++ b/build-mingw-hx-dos @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-mingw-lowend b/build-mingw-lowend index 7c5ae28f794..6b8085a78c3 100644 --- a/build-mingw-lowend +++ b/build-mingw-lowend @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-mingw-lowend-sdl2 b/build-mingw-lowend-sdl2 index 9e1e5f436f4..b7e68949201 100644 --- a/build-mingw-lowend-sdl2 +++ b/build-mingw-lowend-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-mingw-sdl2 b/build-mingw-sdl2 index 6a425e641d1..0aeb980e2bf 100644 --- a/build-mingw-sdl2 +++ b/build-mingw-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-mingw-sdldraw b/build-mingw-sdldraw index 34b99f1a532..d15e9642dd4 100644 --- a/build-mingw-sdldraw +++ b/build-mingw-sdldraw @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-riscos b/build-riscos index 45a2dea9f8c..64b2c1eb848 100755 --- a/build-riscos +++ b/build-riscos @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/build-scripts/macosx/make-macosx-build.sh b/build-scripts/macosx/make-macosx-build.sh index 5a055c281c8..202fb4713d0 100755 --- a/build-scripts/macosx/make-macosx-build.sh +++ b/build-scripts/macosx/make-macosx-build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Setup: # git clone https://github.com/joncampbell123/dosbox-x dosbox-x diff --git a/build-scripts/mingw/make-mingw-hx-dos.sh b/build-scripts/mingw/make-mingw-hx-dos.sh index 8df371a04cb..e10127de3cb 100755 --- a/build-scripts/mingw/make-mingw-hx-dos.sh +++ b/build-scripts/mingw/make-mingw-hx-dos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Setup: # git clone https://github.com/joncampbell123/dosbox-x dosbox-x-mingw-hx-dos diff --git a/build-scripts/mingw/make-mingw.sh b/build-scripts/mingw/make-mingw.sh index 378e095c4af..ac43fb51f48 100644 --- a/build-scripts/mingw/make-mingw.sh +++ b/build-scripts/mingw/make-mingw.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Setup: # git clone https://github.com/joncampbell123/dosbox-x dosbox-x-mingw diff --git a/build-sdl2 b/build-sdl2 index 53bca494e52..4c4bbb4a88c 100644 --- a/build-sdl2 +++ b/build-sdl2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # I'm sick and tired of all the churn the three versions of autoconf # are causing in this repo. Stop committing the configure scripts diff --git a/cleantree b/cleantree index 44ec299b9d6..a28ea8a32f2 100755 --- a/cleantree +++ b/cleantree @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash ./cleanup diff --git a/cleanup b/cleanup index 00503fec8b4..680742c8e77 100755 --- a/cleanup +++ b/cleanup @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash make clean 2>/dev/null make distclean 2>/dev/null find -name \*~ -delete diff --git a/contrib/mappings/regenerate.sh b/contrib/mappings/regenerate.sh index 9ba1c1deb13..8d454a1f741 100755 --- a/contrib/mappings/regenerate.sh +++ b/contrib/mappings/regenerate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ./sb2u.pl cp437_to_unicode ../../include/cp437_uni.h || exit 1 ./sb2u.pl cp737_to_unicode ../../include/cp737_uni.h || exit 1 ./sb2u.pl cp775_to_unicode ../../include/cp775_uni.h || exit 1 diff --git a/dos2unix.sh b/dos2unix.sh index ff7e2d925aa..8e705e3917d 100755 --- a/dos2unix.sh +++ b/dos2unix.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash for ext in c cpp h; do find -iname \*.$ext | while read X; do dos2unix -- "$X" || exit 1; done done diff --git a/env-gcc-4.8-rpi.sh b/env-gcc-4.8-rpi.sh index 2d9100607c0..2d1a1331ebf 100755 --- a/env-gcc-4.8-rpi.sh +++ b/env-gcc-4.8-rpi.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Look for GCC-4.8 x=`which gcc-4.8` diff --git a/env-gcc-4.8.sh b/env-gcc-4.8.sh index f02456f6189..812159f9fda 100755 --- a/env-gcc-4.8.sh +++ b/env-gcc-4.8.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Look for GCC-4.8 x=`which gcc-4.8 2>/dev/null` diff --git a/env-gcc-8.3.sh b/env-gcc-8.3.sh index ac37106409f..b151d8105a5 100755 --- a/env-gcc-8.3.sh +++ b/env-gcc-8.3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Look for GCC-8.3 x=`which gcc-8.3 2>/dev/null` diff --git a/env-gcc-8.4.sh b/env-gcc-8.4.sh index ed9e4dd2acc..2e8b7928ce4 100755 --- a/env-gcc-8.4.sh +++ b/env-gcc-8.4.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Look for GCC-8.4 x=`which gcc-8.4 2>/dev/null` diff --git a/env-gcc-9.2.sh b/env-gcc-9.2.sh index 15fba6fc5c5..2457d5dff34 100755 --- a/env-gcc-9.2.sh +++ b/env-gcc-9.2.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Look for GCC-9.2 x=`which gcc-9.2 2>/dev/null` diff --git a/env-gcc-9.3.sh b/env-gcc-9.3.sh index 3ac5c871545..551ff635927 100755 --- a/env-gcc-9.3.sh +++ b/env-gcc-9.3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Look for GCC-9.3 x=`which gcc-9.3 2>/dev/null` diff --git a/git-pull-mainline.sh b/git-pull-mainline.sh index 9dd2c7ed771..02a4935962d 100755 --- a/git-pull-mainline.sh +++ b/git-pull-mainline.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash git remote add mainline svn://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk git fetch mainline diff --git a/git-push-to-github.sh b/git-push-to-github.sh index b2c953fcb4a..97f9ed7d905 100755 --- a/git-push-to-github.sh +++ b/git-push-to-github.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash git remote add github https://joncampbell123@github.com/joncampbell123/dosbox-x.git # might fail git remote set-url github https://joncampbell123@github.com/joncampbell123/dosbox-x.git # might fail git push github master diff --git a/git-setup-sdl2-work.sh b/git-setup-sdl2-work.sh index dd09c321472..8ad7dd20e3b 100755 --- a/git-setup-sdl2-work.sh +++ b/git-setup-sdl2-work.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash url="https://github.com/wcp16/dosbox-xe.git" branch="dosbox-sdl2-upstream" git remote add "$branch" "$url" || git remote set-url "$branch" "$url" || exit 1 diff --git a/git-update-all b/git-update-all index fac6fb57ece..dd0da3da8f9 100755 --- a/git-update-all +++ b/git-update-all @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # sort of like svn-update-all curbranch=`git branch | grep '^\*' | sed -e 's/^\* //'` diff --git a/git-update-all-wo-push b/git-update-all-wo-push index 89d04e39202..37a97efee29 100755 --- a/git-update-all-wo-push +++ b/git-update-all-wo-push @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # sort of like svn-update-all make clean 2>/dev/null make distclean 2>/dev/null diff --git a/make-flatpak.sh b/make-flatpak.sh index 834ce6cdf19..2a4e061915a 100755 --- a/make-flatpak.sh +++ b/make-flatpak.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ ! -x $(which flatpak-builder) ]]; then echo Please install flatpak-builder diff --git a/make-rpm.sh.in b/make-rpm.sh.in index 713958ab757..a9d44a5643c 100755 --- a/make-rpm.sh.in +++ b/make-rpm.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash arch=`uname -m` if [ -z "$arch" ]; then echo Sorry, cannot identify architecture diff --git a/merge-dev-to-master.sh b/merge-dev-to-master.sh index a9055558033..428b3abbc1f 100755 --- a/merge-dev-to-master.sh +++ b/merge-dev-to-master.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash curbranch=`git branch | grep \* | cut -d ' ' -f 2` if [[ x"$curbranch" == x"master" || x"$curbranch" == x"develop" ]]; then diff --git a/merge-to-win-ci b/merge-to-win-ci index 5894158ffa2..03653742eeb 100755 --- a/merge-to-win-ci +++ b/merge-to-win-ci @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash doit() { git checkout master-win-ci || return 1 diff --git a/mod2wav.sh b/mod2wav.sh index fa307f1462c..fe6fcb9805e 100755 --- a/mod2wav.sh +++ b/mod2wav.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash mikmod -o 16s -f 48000 -hq -p 0 -d wav,file="$1.wav" "$1" diff --git a/mtavi2wav.sh b/mtavi2wav.sh index fa32cf95be1..fa57e8ea765 100755 --- a/mtavi2wav.sh +++ b/mtavi2wav.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Stupid multitrack audio hack for stupid Premiere. # Turns a DOSBox-X multitrack AVI capture into several WAV files. diff --git a/mts_to_1080p.sh b/mts_to_1080p.sh index aec28f394a4..1769ad4c44b 100755 --- a/mts_to_1080p.sh +++ b/mts_to_1080p.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash file="$1" bitrate=15000000 aspect_ratio=4:3 diff --git a/mts_to_2160p.sh b/mts_to_2160p.sh index 135fa113898..57271a86059 100755 --- a/mts_to_2160p.sh +++ b/mts_to_2160p.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash file="$1" bitrate=15000000 aspect_ratio=4:3 diff --git a/mts_to_720p.sh b/mts_to_720p.sh index f15fb770906..618ce91e0fa 100755 --- a/mts_to_720p.sh +++ b/mts_to_720p.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash file="$1" bitrate=15000000 aspect_ratio=4:3 diff --git a/scaleup-4x3-mp4-to-1080p.sh b/scaleup-4x3-mp4-to-1080p.sh index a8885cc0d79..0815d055b57 100755 --- a/scaleup-4x3-mp4-to-1080p.sh +++ b/scaleup-4x3-mp4-to-1080p.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash src="$1" dst="$1.1080p.mp4" diff --git a/scaleup-4x3-mts-to-1080p.sh b/scaleup-4x3-mts-to-1080p.sh index e189c3b9396..b70b75d68d9 100755 --- a/scaleup-4x3-mts-to-1080p.sh +++ b/scaleup-4x3-mts-to-1080p.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash src="$1" dst="$1.1080p.mp4" diff --git a/src/builtin/update-dsxmenu-pc98.sh b/src/builtin/update-dsxmenu-pc98.sh index 406899b808b..44d1343185a 100755 --- a/src/builtin/update-dsxmenu-pc98.sh +++ b/src/builtin/update-dsxmenu-pc98.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash (cd /usr/src/doslib/tool/dsxmenu && ./make.sh) || exit 1 filename="DSXMENU.EXE" diff --git a/src/builtin/update-dsxmenu.sh b/src/builtin/update-dsxmenu.sh index 1387341f590..3e6e1d4707a 100755 --- a/src/builtin/update-dsxmenu.sh +++ b/src/builtin/update-dsxmenu.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash (cd /usr/src/doslib/tool/dsxmenu && ./make.sh) || exit 1 filename="DSXMENU.EXE" diff --git a/update-docs-site b/update-docs-site index 52eb30e7d93..840fb06df4b 100755 --- a/update-docs-site +++ b/update-docs-site @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash make dox || exit 1 make dox-site-update || exit 1 make compat-site-update diff --git a/update-dosbox-x-reference-conf b/update-dosbox-x-reference-conf index 490296f80b0..7bed474f690 100755 --- a/update-dosbox-x-reference-conf +++ b/update-dosbox-x-reference-conf @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash src/dosbox-x -defaultconf -defaultdir . -silent -c 'config -wcp dosbox-x.reference.conf' -c 'config -all -wcp dosbox-x.reference.full.conf' -c 'config -setup -wcp contrib/windows/installer/dosbox-x.reference.setup.conf' || exit 1 # Convert to Unix format if needed diff --git a/update-en-translation b/update-en-translation index 0167217b691..a9da9936ec7 100644 --- a/update-en-translation +++ b/update-en-translation @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash src/dosbox-x -defaultconf -defaultdir . -silent -c "config -ln \"English (United States)\" -wl contrib/translations/en/en_US.lng" || exit 1 exit 0 diff --git a/update-version-number b/update-version-number index b9e06320c9f..75ba6aaa728 100755 --- a/update-version-number +++ b/update-version-number @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -z "$1" ] then diff --git a/vs/freetype/build-dosbox.sh b/vs/freetype/build-dosbox.sh index 46c76798d56..3fa2e950566 100755 --- a/vs/freetype/build-dosbox.sh +++ b/vs/freetype/build-dosbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash rm -Rfv linux-host || exit 1 mkdir -p linux-host || exit 1 diff --git a/vs/libpng/build-dosbox.sh b/vs/libpng/build-dosbox.sh index a78497d8ddf..e3a3e694d5c 100755 --- a/vs/libpng/build-dosbox.sh +++ b/vs/libpng/build-dosbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash rm -Rfv linux-host || exit 1 mkdir -p linux-host || exit 1 diff --git a/vs/libpng/contrib/oss-fuzz/build.sh b/vs/libpng/contrib/oss-fuzz/build.sh index d2137b13e70..c1b98c3de28 100755 --- a/vs/libpng/contrib/oss-fuzz/build.sh +++ b/vs/libpng/contrib/oss-fuzz/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eu +#!/usr/bin/env bash -eu # Copyright 2017 Glenn Randers-Pehrson # Copyright 2016 Google Inc. # diff --git a/vs/sdl/build-dosbox.sh b/vs/sdl/build-dosbox.sh index 52949528c00..4c012ec92d2 100755 --- a/vs/sdl/build-dosbox.sh +++ b/vs/sdl/build-dosbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash rm -Rfv linux-host || exit 1 mkdir -p linux-host || exit 1 diff --git a/vs/sdl2/build-dosbox.sh b/vs/sdl2/build-dosbox.sh index 443fe8de3e7..f56b277498e 100755 --- a/vs/sdl2/build-dosbox.sh +++ b/vs/sdl2/build-dosbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash rm -Rfv linux-host || exit 1 mkdir -p linux-host || exit 1 diff --git a/vs/sdl2/build-scripts/androidbuild.sh b/vs/sdl2/build-scripts/androidbuild.sh index 81457818243..8c1cfe34328 100755 --- a/vs/sdl2/build-scripts/androidbuild.sh +++ b/vs/sdl2/build-scripts/androidbuild.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash SOURCES=() MKSOURCES="" diff --git a/vs/sdl2/build-scripts/checker-buildbot.sh b/vs/sdl2/build-scripts/checker-buildbot.sh index cc16a50a2fa..c3bf60d3e57 100755 --- a/vs/sdl2/build-scripts/checker-buildbot.sh +++ b/vs/sdl2/build-scripts/checker-buildbot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This is a script used by some Buildbot buildslaves to push the project # through Clang's static analyzer and prepare the output to be uploaded diff --git a/vs/sdl2/build-scripts/emscripten-buildbot.sh b/vs/sdl2/build-scripts/emscripten-buildbot.sh index 65b43e83ea2..34893840367 100755 --- a/vs/sdl2/build-scripts/emscripten-buildbot.sh +++ b/vs/sdl2/build-scripts/emscripten-buildbot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -z "$SDKDIR" ]; then SDKDIR="/emsdk_portable" diff --git a/vs/sdl2/build-scripts/nacl-buildbot.sh b/vs/sdl2/build-scripts/nacl-buildbot.sh index 73aae9eaf40..7ae1e18d89c 100755 --- a/vs/sdl2/build-scripts/nacl-buildbot.sh +++ b/vs/sdl2/build-scripts/nacl-buildbot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This is the script buildbot.libsdl.org uses to cross-compile SDL2 from # amd64 Linux to NaCl. diff --git a/vs/sdl2/build-scripts/naclbuild.sh b/vs/sdl2/build-scripts/naclbuild.sh index db745f9e31d..3540757df67 100755 --- a/vs/sdl2/build-scripts/naclbuild.sh +++ b/vs/sdl2/build-scripts/naclbuild.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -z "$1" ] && [ -z "$NACL_SDK_ROOT" ]; then echo "Usage: ./naclbuild ~/nacl/pepper_35" echo "This will build SDL for Native Client, and testgles2.c as a demo" diff --git a/vs/sdl2/build-scripts/raspberrypi-buildbot.sh b/vs/sdl2/build-scripts/raspberrypi-buildbot.sh index e81fbb56dcd..867c3507c42 100755 --- a/vs/sdl2/build-scripts/raspberrypi-buildbot.sh +++ b/vs/sdl2/build-scripts/raspberrypi-buildbot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This is the script buildbot.libsdl.org uses to cross-compile SDL2 from # x86 Linux to Raspberry Pi. diff --git a/vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh b/vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh index f0fc767a922..3d3a4e294bc 100755 --- a/vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh +++ b/vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #### Configuration: # The name of the executable. It is assumed diff --git a/vs/sdl2/src/hidapi/testgui/start.sh b/vs/sdl2/src/hidapi/testgui/start.sh index 980635d955b..3247f164bf3 100755 --- a/vs/sdl2/src/hidapi/testgui/start.sh +++ b/vs/sdl2/src/hidapi/testgui/start.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash xterm -e /Users/alan/work/hidapi/testgui/TestGUI.app/Contents/MacOS/tg diff --git a/vs/sdl2/src/render/metal/build-metal-shaders.sh b/vs/sdl2/src/render/metal/build-metal-shaders.sh index 8ebf63eaba2..a8dd6fe201f 100755 --- a/vs/sdl2/src/render/metal/build-metal-shaders.sh +++ b/vs/sdl2/src/render/metal/build-metal-shaders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x set -e diff --git a/vs/sdlnet/build-dosbox.sh b/vs/sdlnet/build-dosbox.sh index 5d8c30a5652..2bef573e66f 100755 --- a/vs/sdlnet/build-dosbox.sh +++ b/vs/sdlnet/build-dosbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash rm -Rfv linux-host || exit 1 mkdir -p linux-host || exit 1 diff --git a/vs/zlib/build-dosbox.sh b/vs/zlib/build-dosbox.sh index e89fec18874..45649dd09a6 100755 --- a/vs/zlib/build-dosbox.sh +++ b/vs/zlib/build-dosbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash rm -Rfv linux-host || exit 1 mkdir -p linux-host || exit 1