summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-06-11 14:29:10 +1000
committerteor <teor@torproject.org>2019-06-11 14:29:10 +1000
commit973800b847844cfaacf48658d02fe3ada77cbcf6 (patch)
tree3d611a49f0a3293a8d040c7c360b03e393a0e516 /scripts
parent0635170cf14c3b622ee9fdf67ea81f4e564dd39d (diff)
downloadtor-973800b847844cfaacf48658d02fe3ada77cbcf6.tar.gz
tor-973800b847844cfaacf48658d02fe3ada77cbcf6.zip
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 (limited to 'scripts')
-rwxr-xr-xscripts/git/git-merge-forward.sh2
-rwxr-xr-xscripts/git/git-pull-all.sh2
-rwxr-xr-xscripts/git/git-push-all.sh2
-rwxr-xr-xscripts/git/pre-commit.git-hook2
-rwxr-xr-xscripts/git/pre-push.git-hook2
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index 15af6f3dba..c9ec55ac6f 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 6fe7e59812..e5ba96a059 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 0701b27b59..2030a600ff 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 b285776c04..2a29837198 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 c9e72a4d43..51b0c896c8 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-*