mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

script: Enable SC2155 rule for Gitian scripts

Browse source 
Also pwd command is replaced with $PWD variable everywhere for
consistency.
This commit is contained in:
Hennadii Stepanov 2019-11-03 21:57:11 +02:00
parent 577682d9e8
commit 61bb21b418
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
6 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/gitian-descriptors/gitian-linux.yml
View file

@ -51,7 +51,7 @@ script: |
export QT_RCC_TEST=1 export QT_RCC_TEST=1
export QT_RCC_SOURCE_DATE_OVERRIDE=1 export QT_RCC_SOURCE_DATE_OVERRIDE=1
export TZ="UTC" export TZ="UTC"
export BUILD_DIR=$(pwd) export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}
if test -n "$GBUILD_CACHE_ENABLED"; then if test -n "$GBUILD_CACHE_ENABLED"; then
export SOURCES_PATH=${GBUILD_COMMON_CACHE} export SOURCES_PATH=${GBUILD_COMMON_CACHE}
@ -122,7 +122,7 @@ script: |
done done
cd bitcoin cd bitcoin
BASEPREFIX=$(pwd)/depends BASEPREFIX="${PWD}/depends"
# Build dependencies for each host # Build dependencies for each host
for i in $HOSTS; do for i in $HOSTS; do
EXTRA_INCLUDES="$EXTRA_INCLUDES_BASE/$i" EXTRA_INCLUDES="$EXTRA_INCLUDES_BASE/$i"
@ -161,7 +161,7 @@ script: |
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
mkdir -p distsrc-${i} mkdir -p distsrc-${i}
cd distsrc-${i} cd distsrc-${i}
INSTALLPATH=$(pwd)/installed/${DISTNAME} INSTALLPATH="${PWD}/installed/${DISTNAME}"
mkdir -p ${INSTALLPATH} mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST tar --strip-components=1 -xf ../$SOURCEDIST

2
contrib/gitian-descriptors/gitian-osx-signer.yml
View file

@ -17,7 +17,7 @@ script: |
WRAP_DIR=$HOME/wrapped WRAP_DIR=$HOME/wrapped
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}
export PATH=$(pwd):$PATH export PATH="$PWD":$PATH
FAKETIME_PROGS="dmg genisoimage" FAKETIME_PROGS="dmg genisoimage"
# Create global faketime wrappers # Create global faketime wrappers

6
contrib/gitian-descriptors/gitian-osx.yml
View file

@ -45,7 +45,7 @@ script: |
export QT_RCC_TEST=1 export QT_RCC_TEST=1
export QT_RCC_SOURCE_DATE_OVERRIDE=1 export QT_RCC_SOURCE_DATE_OVERRIDE=1
export TZ="UTC" export TZ="UTC"
export BUILD_DIR=$(pwd) export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}
if test -n "$GBUILD_CACHE_ENABLED"; then if test -n "$GBUILD_CACHE_ENABLED"; then
export SOURCES_PATH=${GBUILD_COMMON_CACHE} export SOURCES_PATH=${GBUILD_COMMON_CACHE}
@ -86,7 +86,7 @@ script: |
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
cd bitcoin cd bitcoin
BASEPREFIX=$(pwd)/depends BASEPREFIX="${PWD}/depends"
mkdir -p ${BASEPREFIX}/SDKs mkdir -p ${BASEPREFIX}/SDKs
tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz
@ -125,7 +125,7 @@ script: |
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
mkdir -p distsrc-${i} mkdir -p distsrc-${i}
cd distsrc-${i} cd distsrc-${i}
INSTALLPATH=$(pwd)/installed/${DISTNAME} INSTALLPATH="${PWD}/installed/${DISTNAME}"
mkdir -p ${INSTALLPATH} mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST tar --strip-components=1 -xf ../$SOURCEDIST

2
contrib/gitian-descriptors/gitian-win-signer.yml
View file

@ -19,7 +19,7 @@ files:
script: | script: |
set -e -o pipefail set -e -o pipefail
BUILD_DIR=$(pwd) BUILD_DIR="$PWD"
SIGDIR=${BUILD_DIR}/signature/win SIGDIR=${BUILD_DIR}/signature/win
UNSIGNED_DIR=${BUILD_DIR}/unsigned UNSIGNED_DIR=${BUILD_DIR}/unsigned

6
contrib/gitian-descriptors/gitian-win.yml
View file

@ -40,7 +40,7 @@ script: |
export QT_RCC_TEST=1 export QT_RCC_TEST=1
export QT_RCC_SOURCE_DATE_OVERRIDE=1 export QT_RCC_SOURCE_DATE_OVERRIDE=1
export TZ="UTC" export TZ="UTC"
export BUILD_DIR=$(pwd) export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}
if test -n "$GBUILD_CACHE_ENABLED"; then if test -n "$GBUILD_CACHE_ENABLED"; then
export SOURCES_PATH=${GBUILD_COMMON_CACHE} export SOURCES_PATH=${GBUILD_COMMON_CACHE}
@ -96,7 +96,7 @@ script: |
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
cd bitcoin cd bitcoin
BASEPREFIX=$(pwd)/depends BASEPREFIX="${PWD}/depends"
# Build dependencies for each host # Build dependencies for each host
for i in $HOSTS; do for i in $HOSTS; do
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
@ -131,7 +131,7 @@ script: |
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
mkdir -p distsrc-${i} mkdir -p distsrc-${i}
cd distsrc-${i} cd distsrc-${i}
INSTALLPATH=$(pwd)/installed/${DISTNAME} INSTALLPATH="${PWD}/installed/${DISTNAME}"
mkdir -p ${INSTALLPATH} mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST tar --strip-components=1 -xf ../$SOURCEDIST

1
test/lint/lint-shell.sh
View file

@ -26,7 +26,6 @@ disabled_gitian=(
SC2001 # See if you can use ${variable//search/replace} instead. SC2001 # See if you can use ${variable//search/replace} instead.
SC2094 # Make sure not to read and write the same file in the same pipeline. SC2094 # Make sure not to read and write the same file in the same pipeline.
SC2129 # Consider using { cmd1; cmd2; } >> file instead of individual redirects. SC2129 # Consider using { cmd1; cmd2; } >> file instead of individual redirects.
SC2155 # Declare and assign separately to avoid masking return values.
SC2230 # which is non-standard. Use builtin 'command -v' instead. SC2230 # which is non-standard. Use builtin 'command -v' instead.
) )