From 2e2514683a81bcad522e8ca6464040da43eaff9b Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 5 Aug 2021 14:08:49 +0200 Subject: [PATCH] dapp: remappings: fix transitive-imports flag --- src/dapp/libexec/dapp/dapp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dapp/libexec/dapp/dapp b/src/dapp/libexec/dapp/dapp index 8eb1d4379..c01c2906a 100755 --- a/src/dapp/libexec/dapp/dapp +++ b/src/dapp/libexec/dapp/dapp @@ -106,13 +106,6 @@ if ! [[ $DAPP_INIT ]]; then [[ $(pwd) != ~ && -e .dapprc ]] && . .dapprc fi -export DAPP_SRC=${DAPP_SRC-src} -export DAPP_LIB=${DAPP_LIB-lib} -export DAPP_OUT=${DAPP_OUT-out} -export DAPP_JSON=${DAPP_JSON-${DAPP_OUT}/dapp.sol.json} -export DAPP_ROOT=${DAPP_ROOT-.} -export DAPP_REMAPPINGS=${DAPP_REMAPPINGS-"$(dapp-remappings)"} - if [[ $2 = --help ]]; then exec "${0##*/}" help -- "$1" elif [[ $DAPP_SOLC_VERSION ]]; then @@ -176,6 +169,13 @@ while [[ $1 ]]; do esac; shift done +export DAPP_SRC=${DAPP_SRC-src} +export DAPP_LIB=${DAPP_LIB-lib} +export DAPP_OUT=${DAPP_OUT-out} +export DAPP_JSON=${DAPP_JSON-${DAPP_OUT}/dapp.sol.json} +export DAPP_ROOT=${DAPP_ROOT-.} +export DAPP_REMAPPINGS=${DAPP_REMAPPINGS-"$(dapp-remappings)"} + if ! [ -x "$(command -v "${0##*/}-${1-help}")" ]; then # look for approximate matches echo >&2 "'$1' is not a dapp command. See 'dapp help'."