commit 973800b847844cfaacf48658d02fe3ada77cbcf6 Author: teor teor@torproject.org Date: Tue Jun 11 14:29:10 2019 +1000

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. --- changes/bug30840 | 4 ++++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 2 +- scripts/git/pre-commit.git-hook | 2 +- scripts/git/pre-push.git-hook | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/changes/bug30840 b/changes/bug30840 new file mode 100644 index 000000000..562b0fbd9 --- /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 15af6f3db..c9ec55ac6 100755 --- 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 6fe7e5981..e5ba96a05 100755 --- 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 0701b27b5..2030a600f 100755 --- 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 b285776c0..2a2983719 100755 --- 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 c9e72a4d4..51b0c896c 100755 --- 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-*