highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-12 19:52:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #20359: depends: Various config.site.in improvements and linting

Browse Source 
46756a6987 depends: Fix PYTHONPATH setting in config.site.in (Carl Dong)
618cbd2c1a lint: Also lint files with shellcheck directive (Carl Dong)
6c7e8f067d depends: Allow relative CONFIG_SITE path env var (Carl Dong)

Pull request description:

  This changeset:

  1. Allows the `CONFIG_SITE` env var to be a relative path rather than requiring an absolute one
  2. Enables linting of the `config.site.in` file with `shellcheck` in our linting scripts
  3. Sets the `PYTHONPATH` var sensibly in `config.site.in`

  Please see commit messages for more details

ACKs for top commit:
  laanwj:
    ACK 46756a6987

Tree-SHA512: 744089b9f6e5604e56466d9a3e64563f9183a70f7e300ac9ae6248f0f17c0b53fe28a2c41d43c5ffe5da825f53c2ca21f21aacba0579442da3056fb0c4b81454
This commit is contained in:
Wladimir J. van der Laan
2020-11-19 11:27:43 +01:00
parent cddcd22ab3 46756a6987
commit 888c22e0dd
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/lint/lint-shell.sh
View File

@ -36,7 +36,8 @@ fi
SHELLCHECK_CMD=(shellcheck --external-sources --check-sourced)
EXCLUDE="--exclude=$(IFS=','; echo "${disabled[*]}")"
if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|secp256k1|univalue)/'); then
SOURCED_FILES=$(git ls-files | xargs gawk '/^# shellcheck shell=/ {print FILENAME} {nextfile}') # Check shellcheck directive used for sourced files
if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $SOURCED_FILES $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|secp256k1|univalue)/'); then
EXIT_CODE=1
fi