Browse Source

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>
tags/v1.31.0rc1
Quentin Gliech 3 years ago
committed by GitHub
parent
commit
d4c4798a25
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 18 additions and 17 deletions
  1. +1
    -1
      .buildkite/scripts/test_old_deps.sh
  2. +1
    -1
      .buildkite/scripts/test_synapse_port_db.sh
  3. +1
    -0
      changelog.d/9689.misc
  4. +1
    -1
      contrib/purge_api/purge_history.sh
  5. +1
    -1
      contrib/purge_api/purge_remote_media.sh
  6. +1
    -1
      demo/clean.sh
  7. +1
    -1
      demo/start.sh
  8. +1
    -1
      demo/stop.sh
  9. +1
    -1
      docker/build_debian.sh
  10. +1
    -1
      docker/run_pg_tests.sh
  11. +1
    -1
      scripts-dev/check-newsfragment
  12. +1
    -1
      scripts-dev/config-lint.sh
  13. +1
    -1
      scripts-dev/generate_sample_config
  14. +1
    -1
      scripts-dev/lint.sh
  15. +1
    -1
      scripts-dev/make_full_schema.sh
  16. +2
    -2
      scripts-dev/next_github_number.sh
  17. +1
    -1
      test_postgresql.sh

+ 1
- 1
.buildkite/scripts/test_old_deps.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# this script is run by buildkite in a plain `xenial` container; it installs the
# minimal requirements for tox and hands over to the py35-old tox environment.


+ 1
- 1
.buildkite/scripts/test_synapse_port_db.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# Test script for 'synapse_port_db', which creates a virtualenv, installs Synapse along
# with additional dependencies needed for the test (such as coverage or the PostgreSQL


+ 1
- 0
changelog.d/9689.misc View File

@@ -0,0 +1 @@
Use interpreter from `$PATH` via `/usr/bin/env` instead of absolute paths in various scripts.

+ 1
- 1
contrib/purge_api/purge_history.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# this script will use the api:
# https://github.com/matrix-org/synapse/blob/master/docs/admin_api/purge_history_api.rst


+ 1
- 1
contrib/purge_api/purge_remote_media.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

DOMAIN=yourserver.tld
# add this user as admin in your home server:


+ 1
- 1
demo/clean.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -e



+ 1
- 1
demo/start.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

DIR="$( cd "$( dirname "$0" )" && pwd )"



+ 1
- 1
demo/stop.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

DIR="$( cd "$( dirname "$0" )" && pwd )"



+ 1
- 1
docker/build_debian.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# The script to build the Debian package, as ran inside the Docker image.



+ 1
- 1
docker/run_pg_tests.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# This script runs the PostgreSQL tests inside a Docker container. It expects
# the relevant source files to be mounted into /src (done automatically by the


+ 1
- 1
scripts-dev/check-newsfragment View File

@@ -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.


+ 1
- 1
scripts-dev/config-lint.sh View File

@@ -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.



+ 1
- 1
scripts-dev/generate_sample_config View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# Update/check the docs/sample_config.yaml



+ 1
- 1
scripts-dev/lint.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# Runs linting scripts over the local Synapse checkout
# isort - sorts import statements


+ 1
- 1
scripts-dev/make_full_schema.sh View File

@@ -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.


+ 2
- 2
scripts-dev/next_github_number.sh View File

@@ -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
echo $CURRENT_NUMBER

+ 1
- 1
test_postgresql.sh View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# This script builds the Docker image to run the PostgreSQL tests, and then runs
# the tests.


Loading…
Cancel
Save