commit 973800b847844cfaacf48658d02fe3ada77cbcf6
parent 0635170cf14c3b622ee9fdf67ea81f4e564dd39d
Author: teor <teor@torproject.org>
Date: Tue, 11 Jun 2019 14:29:10 +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.
Diffstat:
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/changes/bug30840 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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-*
