From f58e51624980aa504963c1da7639f29692c1febc Mon Sep 17 00:00:00 2001
From: "David J. Y. Tang" <davidt@arisan.io>
Date: Thu, 9 Sep 2021 00:02:32 +0800
Subject: [PATCH] Use flexible shebang for user-facing scripts

---
 addins/4.4.sh                      | 2 +-
 addins/debug.sh                    | 2 +-
 build.sh                           | 2 +-
 generate.sh                        | 2 +-
 makeimage.sh                       | 2 +-
 util/prunetags.sh                  | 2 +-
 util/update_wiki.sh                | 2 +-
 util/vars.sh                       | 2 +-
 variants/default-install.sh        | 2 +-
 variants/defaults-gpl-shared.sh    | 2 +-
 variants/defaults-lgpl-shared.sh   | 2 +-
 variants/linux-install-shared.sh   | 2 +-
 variants/linux64-gpl-shared.sh     | 2 +-
 variants/linux64-gpl.sh            | 2 +-
 variants/linux64-lgpl-shared.sh    | 2 +-
 variants/linux64-lgpl.sh           | 2 +-
 variants/linux64-nonfree-shared.sh | 2 +-
 variants/linux64-nonfree.sh        | 2 +-
 variants/win32-gpl-shared.sh       | 2 +-
 variants/win32-gpl.sh              | 2 +-
 variants/win32-lgpl-shared.sh      | 2 +-
 variants/win32-lgpl.sh             | 2 +-
 variants/win32-nonfree-shared.sh   | 2 +-
 variants/win32-nonfree.sh          | 2 +-
 variants/win64-gpl-shared.sh       | 2 +-
 variants/win64-gpl.sh              | 2 +-
 variants/win64-lgpl-shared.sh      | 2 +-
 variants/win64-lgpl.sh             | 2 +-
 variants/win64-nonfree-shared.sh   | 2 +-
 variants/win64-nonfree.sh          | 2 +-
 variants/windows-install-shared.sh | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/addins/4.4.sh b/addins/4.4.sh
index 6eec695..ecf17b2 100644
--- a/addins/4.4.sh
+++ b/addins/4.4.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 GIT_BRANCH="release/4.4"
diff --git a/addins/debug.sh b/addins/debug.sh
index da940ed..a92d3cd 100644
--- a/addins/debug.sh
+++ b/addins/debug.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 FF_CONFIGURE="${FF_CONFIGURE/--disable-debug/} --optflags='-Og' --disable-stripping"
diff --git a/build.sh b/build.sh
index 802a609..f15736f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -xe
 shopt -s globstar
 cd "$(dirname "$0")"
diff --git a/generate.sh b/generate.sh
index b5ceb93..333fc73 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -xe
 cd "$(dirname "$0")"
 source util/vars.sh
diff --git a/makeimage.sh b/makeimage.sh
index 5fe9ebf..46b430a 100755
--- a/makeimage.sh
+++ b/makeimage.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -xe
 cd "$(dirname "$0")"
 source util/vars.sh
diff --git a/util/prunetags.sh b/util/prunetags.sh
index 991199e..ebe0762 100755
--- a/util/prunetags.sh
+++ b/util/prunetags.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 git fetch --tags
 TAGS=( $(git tag -l "autobuild-*" | sort -r) )
diff --git a/util/update_wiki.sh b/util/update_wiki.sh
index ebb3104..45ab400 100755
--- a/util/update_wiki.sh
+++ b/util/update_wiki.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 if [[ $# != 2 ]]; then
diff --git a/util/vars.sh b/util/vars.sh
index f3002a2..5c11519 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [[ $# -lt 2 ]]; then
     echo "Invalid Arguments"
diff --git a/variants/default-install.sh b/variants/default-install.sh
index 65ae546..d4d4a38 100644
--- a/variants/default-install.sh
+++ b/variants/default-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 package_variant() {
     IN="$1"
diff --git a/variants/defaults-gpl-shared.sh b/variants/defaults-gpl-shared.sh
index 439ebae..37134e1 100644
--- a/variants/defaults-gpl-shared.sh
+++ b/variants/defaults-gpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
 FF_CONFIGURE+=" --enable-shared --disable-static"
diff --git a/variants/defaults-lgpl-shared.sh b/variants/defaults-lgpl-shared.sh
index f9f44ad..623ee3f 100644
--- a/variants/defaults-lgpl-shared.sh
+++ b/variants/defaults-lgpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
 FF_CONFIGURE+=" --enable-shared --disable-static"
diff --git a/variants/linux-install-shared.sh b/variants/linux-install-shared.sh
index d8ac92e..8b4a97b 100644
--- a/variants/linux-install-shared.sh
+++ b/variants/linux-install-shared.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 package_variant() {
     IN="$1"
diff --git a/variants/linux64-gpl-shared.sh b/variants/linux64-gpl-shared.sh
index ca8fbb2..3880d26 100644
--- a/variants/linux64-gpl-shared.sh
+++ b/variants/linux64-gpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/linux-install-shared.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl-shared.sh
diff --git a/variants/linux64-gpl.sh b/variants/linux64-gpl.sh
index b3003a4..47b8208 100644
--- a/variants/linux64-gpl.sh
+++ b/variants/linux64-gpl.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/default-install.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/linux64-lgpl-shared.sh b/variants/linux64-lgpl-shared.sh
index 33244aa..9f5c381 100644
--- a/variants/linux64-lgpl-shared.sh
+++ b/variants/linux64-lgpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/linux-install-shared.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl-shared.sh
diff --git a/variants/linux64-lgpl.sh b/variants/linux64-lgpl.sh
index f000a33..15a35de 100644
--- a/variants/linux64-lgpl.sh
+++ b/variants/linux64-lgpl.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/default-install.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/linux64-nonfree-shared.sh b/variants/linux64-nonfree-shared.sh
index 8df4c8f..93cfd3e 100644
--- a/variants/linux64-nonfree-shared.sh
+++ b/variants/linux64-nonfree-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/linux64-gpl-shared.sh
 FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
diff --git a/variants/linux64-nonfree.sh b/variants/linux64-nonfree.sh
index 230c6e4..570c4db 100644
--- a/variants/linux64-nonfree.sh
+++ b/variants/linux64-nonfree.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/linux64-gpl.sh
 FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
 LICENSE_FILE=""
diff --git a/variants/win32-gpl-shared.sh b/variants/win32-gpl-shared.sh
index 93ff7f1..f42b497 100644
--- a/variants/win32-gpl-shared.sh
+++ b/variants/win32-gpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/windows-install-shared.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl-shared.sh
diff --git a/variants/win32-gpl.sh b/variants/win32-gpl.sh
index b3003a4..47b8208 100644
--- a/variants/win32-gpl.sh
+++ b/variants/win32-gpl.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/default-install.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/win32-lgpl-shared.sh b/variants/win32-lgpl-shared.sh
index ff44219..e2127ef 100644
--- a/variants/win32-lgpl-shared.sh
+++ b/variants/win32-lgpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/windows-install-shared.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl-shared.sh
diff --git a/variants/win32-lgpl.sh b/variants/win32-lgpl.sh
index f000a33..15a35de 100644
--- a/variants/win32-lgpl.sh
+++ b/variants/win32-lgpl.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/default-install.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/win32-nonfree-shared.sh b/variants/win32-nonfree-shared.sh
index 485c486..e1c3c37 100644
--- a/variants/win32-nonfree-shared.sh
+++ b/variants/win32-nonfree-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/win32-gpl-shared.sh
 FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
diff --git a/variants/win32-nonfree.sh b/variants/win32-nonfree.sh
index c61cd9c..a9a9fba 100644
--- a/variants/win32-nonfree.sh
+++ b/variants/win32-nonfree.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/win32-gpl.sh
 FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
 LICENSE_FILE=""
diff --git a/variants/win64-gpl-shared.sh b/variants/win64-gpl-shared.sh
index 93ff7f1..f42b497 100644
--- a/variants/win64-gpl-shared.sh
+++ b/variants/win64-gpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/windows-install-shared.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl-shared.sh
diff --git a/variants/win64-gpl.sh b/variants/win64-gpl.sh
index b3003a4..47b8208 100644
--- a/variants/win64-gpl.sh
+++ b/variants/win64-gpl.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/default-install.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/win64-lgpl-shared.sh b/variants/win64-lgpl-shared.sh
index ff44219..e2127ef 100644
--- a/variants/win64-lgpl-shared.sh
+++ b/variants/win64-lgpl-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/windows-install-shared.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl-shared.sh
diff --git a/variants/win64-lgpl.sh b/variants/win64-lgpl.sh
index f000a33..15a35de 100644
--- a/variants/win64-lgpl.sh
+++ b/variants/win64-lgpl.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/default-install.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/win64-nonfree-shared.sh b/variants/win64-nonfree-shared.sh
index 5a9d4af..f3f3c1c 100644
--- a/variants/win64-nonfree-shared.sh
+++ b/variants/win64-nonfree-shared.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh
 FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
diff --git a/variants/win64-nonfree.sh b/variants/win64-nonfree.sh
index 176e4d2..3d31524 100644
--- a/variants/win64-nonfree.sh
+++ b/variants/win64-nonfree.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh
 FF_CONFIGURE="--enable-nonfree $FF_CONFIGURE"
 LICENSE_FILE=""
diff --git a/variants/windows-install-shared.sh b/variants/windows-install-shared.sh
index d44677b..22a8310 100644
--- a/variants/windows-install-shared.sh
+++ b/variants/windows-install-shared.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 package_variant() {
     IN="$1"