From c61b0f1a7bb62d989f668edf7a72377e030ab416 Mon Sep 17 00:00:00 2001 From: Stefan Hengl Date: Fri, 6 Aug 2021 12:02:43 +0200 Subject: [PATCH] all: /bin/bash -> /usr/bin/env bash (#23673) I ran into issues setting up Sourcegraph on NixOS, because NixOS, like some other distros, doesn't have a /bin/bash. We already use /usr/bin/env in many of our scripts, so this improves consistency, too. --- cmd/symbols/universal-ctags-dev | 2 +- dev/check/docsite_redirects.sh | 2 +- dev/db/add_migration.sh | 2 +- dev/db/drop-local-database.sh | 2 +- dev/deployed-commit.sh | 2 +- dev/drop-entire-local-database-and-redis.sh | 2 +- dev/phabricator/stop.sh | 2 +- dev/src-expose/release.sh | 2 +- dev/zoekt/wrapper | 2 +- doc/admin/install/docker/google_cloud.md | 2 +- doc/dev/background-information/architecture/generate.sh | 2 +- doc/dev/background-information/codeintel/diagrams/generate.sh | 2 +- docker-images/grafana/entry.sh | 2 +- lib/codeintel/tools/scripts/combine.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/symbols/universal-ctags-dev b/cmd/symbols/universal-ctags-dev index 7cf27d56b2d..9c09b4aa6a8 100755 --- a/cmd/symbols/universal-ctags-dev +++ b/cmd/symbols/universal-ctags-dev @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script is a wrapper around `universal-ctags`. # diff --git a/dev/check/docsite_redirects.sh b/dev/check/docsite_redirects.sh index e36206127d5..c6b38d03ec0 100755 --- a/dev/check/docsite_redirects.sh +++ b/dev/check/docsite_redirects.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu -o pipefail diff --git a/dev/db/add_migration.sh b/dev/db/add_migration.sh index 50beaf2b63c..a7955c4658a 100755 --- a/dev/db/add_migration.sh +++ b/dev/db/add_migration.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cd "$(dirname "${BASH_SOURCE[0]}")"/../../migrations set -e diff --git a/dev/db/drop-local-database.sh b/dev/db/drop-local-database.sh index 6108f436aa2..cdbcff3d4e3 100755 --- a/dev/db/drop-local-database.sh +++ b/dev/db/drop-local-database.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash psql -c "drop schema public cascade; create schema public;" diff --git a/dev/deployed-commit.sh b/dev/deployed-commit.sh index a0f8ac2fc51..f3988bdee65 100755 --- a/dev/deployed-commit.sh +++ b/dev/deployed-commit.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script determines the commit of sourcegraph/sourcegraph that is currently # running on sourcegraph.com. The returned version has one of the following diff --git a/dev/drop-entire-local-database-and-redis.sh b/dev/drop-entire-local-database-and-redis.sh index 3717115519a..2707e8ca184 100755 --- a/dev/drop-entire-local-database-and-redis.sh +++ b/dev/drop-entire-local-database-and-redis.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash psql -c "drop schema public cascade; create schema public;" redis-cli -c flushall diff --git a/dev/phabricator/stop.sh b/dev/phabricator/stop.sh index cef57cf7b17..8df17894636 100755 --- a/dev/phabricator/stop.sh +++ b/dev/phabricator/stop.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e unset CDPATH diff --git a/dev/src-expose/release.sh b/dev/src-expose/release.sh index 2888b6b73c1..6c5244a674b 100755 --- a/dev/src-expose/release.sh +++ b/dev/src-expose/release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/dev/zoekt/wrapper b/dev/zoekt/wrapper index a4fa4f193a8..d199c314e55 100755 --- a/dev/zoekt/wrapper +++ b/dev/zoekt/wrapper @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euf -o pipefail diff --git a/doc/admin/install/docker/google_cloud.md b/doc/admin/install/docker/google_cloud.md index 66884d412ed..b6ccd84ab78 100644 --- a/doc/admin/install/docker/google_cloud.md +++ b/doc/admin/install/docker/google_cloud.md @@ -15,7 +15,7 @@ This tutorial shows you how to deploy [single-container Sourcegraph with Docker] - Open the **Management, disks, networking, and SSH keys** dropdown section and add the following in the **Startup script** field: ``` - #!/bin/bash + #!/usr/bin/env bash curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" sudo apt-get update diff --git a/doc/dev/background-information/architecture/generate.sh b/doc/dev/background-information/architecture/generate.sh index 94c91e5a0d3..194ca4d4122 100755 --- a/doc/dev/background-information/architecture/generate.sh +++ b/doc/dev/background-information/architecture/generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex diff --git a/doc/dev/background-information/codeintel/diagrams/generate.sh b/doc/dev/background-information/codeintel/diagrams/generate.sh index 2c71130e928..36dce29a95d 100755 --- a/doc/dev/background-information/codeintel/diagrams/generate.sh +++ b/doc/dev/background-information/codeintel/diagrams/generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex diff --git a/docker-images/grafana/entry.sh b/docker-images/grafana/entry.sh index aabd964b41f..709b247e7f4 100755 --- a/docker-images/grafana/entry.sh +++ b/docker-images/grafana/entry.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e export GF_PATHS_PROVISIONING=/sg_config_grafana/provisioning diff --git a/lib/codeintel/tools/scripts/combine.sh b/lib/codeintel/tools/scripts/combine.sh index 076f1f6351d..7fbdd832d4c 100755 --- a/lib/codeintel/tools/scripts/combine.sh +++ b/lib/codeintel/tools/scripts/combine.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail if [[ $# -le 0 ]]; then