scripts/git: Stop hard-coding the bash path in the git scripts

Some OSes don't have bash in /usr/bin, others have an ancient bash at
this path.

Fixes bug 30840; bugfix on 0.4.0.1-alpha.

diff --git a/changes/bug30840 b/changes/bug30840
new file mode 100644 (file)
index 0000000..562b0fb
--- /dev/null
+++ b/changes/bug30840
@@ -0,0 +1,4 @@
+  o Minor bugfixes (git scripts):
+    - Stop hard-coding the bash path in the git scripts. Some OSes don't
+      have bash in /usr/bin, others have an ancient bash at this path.
+      Fixes bug 30840; bugfix on 0.4.0.1-alpha.

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index 15af6f3dba0b813f49547f5621814a795765a5d2..c9ec55ac6f4718ea184816048463f62aab6643fd 100755 (executable)
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##############################
 # Configuration (change me!) #

diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index 6fe7e5981209a4b3e133c35a1b78ea8b1872892b..e5ba96a0598193166bdaefeb2ccd2b92dffdba72 100755 (executable)
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##################################
 # User configuration (change me) #

diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 0701b27b5988ee658e595c80a508fe59d1495fb9..2030a600ff47ab3bfe96228bc8e6020cb4d418c9 100755 (executable)
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # The remote upstream branch on which git.torproject.org/tor.git points to.
 UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}

diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
index b285776c0494de2ffdc739822b9dd7a140f89f74..2a2983719818e3396a140e1eb67b4ceb45ab6fa5 100755 (executable)
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # To install this script, copy it to .git/hooks/pre-commit in local copy of
 # tor git repo and make sure it has permission to execute.

diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook
index c9e72a4d43e3932c544135b3dc19200b700a2893..51b0c896c8de57c9b1dd29e8cb27c216c23df3c6 100755 (executable)
--- a/scripts/git/pre-push.git-hook
+++ b/scripts/git/pre-push.git-hook
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # git pre-push hook script to:
 # 1) prevent "fixup!" and "squash!" commit from ending up in master, release-*