diff options
author | Quentin Gliech <quentingliech@gmail.com> | 2021-03-25 17:53:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 16:53:54 +0000 |
commit | d4c4798a2548a53b63546a176f6dd350c4ad26bc (patch) | |
tree | 03a1d35dd268e0d6eebf0163e54789a1df7937b9 /scripts-dev | |
parent | platform specific prerequisites in source install (#9667) (diff) | |
download | synapse-d4c4798a2548a53b63546a176f6dd350c4ad26bc.tar.xz |
Use interpreter from $PATH instead of absolute paths in various scripts using /usr/bin/env (#9689)
On NixOS, `bash` isn't under `/bin/bash` but rather in some directory in `$PATH`. Locally, I've been patching those scripts to make them work. `/usr/bin/env` seems to be the only [portable way](https://unix.stackexchange.com/questions/29608/why-is-it-better-to-use-usr-bin-env-name-instead-of-path-to-name-as-my) to use binaries from the PATH as interpreters. Signed-off-by: Quentin Gliech <quentingliech@gmail.com>
Diffstat (limited to 'scripts-dev')
-rwxr-xr-x | scripts-dev/check-newsfragment | 2 | ||||
-rwxr-xr-x | scripts-dev/config-lint.sh | 2 | ||||
-rwxr-xr-x | scripts-dev/generate_sample_config | 2 | ||||
-rwxr-xr-x | scripts-dev/lint.sh | 2 | ||||
-rwxr-xr-x | scripts-dev/make_full_schema.sh | 2 | ||||
-rwxr-xr-x | scripts-dev/next_github_number.sh | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/scripts-dev/check-newsfragment b/scripts-dev/check-newsfragment index 448cadb829..af6d32e332 100755 --- a/scripts-dev/check-newsfragment +++ b/scripts-dev/check-newsfragment @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # A script which checks that an appropriate news file has been added on this # branch. diff --git a/scripts-dev/config-lint.sh b/scripts-dev/config-lint.sh index 9132160463..8c6323e59a 100755 --- a/scripts-dev/config-lint.sh +++ b/scripts-dev/config-lint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find linting errors in Synapse's default config file. # Exits with 0 if there are no problems, or another code otherwise. diff --git a/scripts-dev/generate_sample_config b/scripts-dev/generate_sample_config index 9cb4630a5c..02739894b5 100755 --- a/scripts-dev/generate_sample_config +++ b/scripts-dev/generate_sample_config @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Update/check the docs/sample_config.yaml diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh index fe2965cd36..9761e97594 100755 --- a/scripts-dev/lint.sh +++ b/scripts-dev/lint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Runs linting scripts over the local Synapse checkout # isort - sorts import statements diff --git a/scripts-dev/make_full_schema.sh b/scripts-dev/make_full_schema.sh index b8d1e636f1..bc8f978660 100755 --- a/scripts-dev/make_full_schema.sh +++ b/scripts-dev/make_full_schema.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # This script generates SQL files for creating a brand new Synapse DB with the latest # schema, on both SQLite3 and Postgres. diff --git a/scripts-dev/next_github_number.sh b/scripts-dev/next_github_number.sh index 376280025a..00e9b14569 100755 --- a/scripts-dev/next_github_number.sh +++ b/scripts-dev/next_github_number.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e @@ -6,4 +6,4 @@ set -e # next PR number. CURRENT_NUMBER=`curl -s "https://api.github.com/repos/matrix-org/synapse/issues?state=all&per_page=1" | jq -r ".[0].number"` CURRENT_NUMBER=$((CURRENT_NUMBER+1)) -echo $CURRENT_NUMBER \ No newline at end of file +echo $CURRENT_NUMBER |