diff options
author | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-18 00:38:01 +0800 |
---|---|---|
committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-26 02:03:24 +0800 |
commit | c9f468b7172157752df64c4ff3d7bfab01650a65 (patch) | |
tree | a2a5ee7175c184f6af588df5abf2f54847c52a83 | |
parent | 321ab08102d5d238bc594e357b94bef2207cf7d2 (diff) | |
download | dexon-solidity-c9f468b7172157752df64c4ff3d7bfab01650a65.tar.gz dexon-solidity-c9f468b7172157752df64c4ff3d7bfab01650a65.tar.zst dexon-solidity-c9f468b7172157752df64c4ff3d7bfab01650a65.zip |
Better regex for finding version pragmas and replace it with >=0.0
There is a bug which stops ^0 from working.
-rwxr-xr-x | test/cmdlineTests.sh | 2 | ||||
-rwxr-xr-x | test/externalTests.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh index e4218b6e..78e45429 100755 --- a/test/cmdlineTests.sh +++ b/test/cmdlineTests.sh @@ -178,7 +178,7 @@ do echo " - $dir" cd "$dir" # Replace version pragmas - find . -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity [^;]+/pragma solidity ^0/' + find . -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity [\^0-9\.]*/pragma solidity >=0.0/' compileFull -w *.sol */*.sol cd .. fi diff --git a/test/externalTests.sh b/test/externalTests.sh index 17768875..0168fb03 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -59,7 +59,7 @@ function test_truffle if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then echo "Replaced fixed-version pragmas..." # Replace fixed-version pragmas in Gnosis (part of Consensys best practice) - find contracts test -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity [^;]+/pragma solidity ^0/' + find contracts test -name '*.sol' -type f -print0 | xargs -0 sed -i -e 's/pragma solidity [\^0-9\.]*/pragma solidity >=0.0/' fi assertsol="node_modules/truffle/build/Assert.sol" if [ -f "$assertsol" ] |