aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2018-02-15 06:38:48 +0800
committerGitHub <noreply@github.com>2018-02-15 06:38:48 +0800
commitab1f070901bf6dc6ba39abc1e0dd67c3c342a174 (patch)
treef84ecca15527af8b4cde77aca7b082c74010c1d5
parent18e1c2dea5d3c5387db6f616cd0ebbfe89dc308b (diff)
parent7f1e789264e2b67c7feffc633bd64caa257657cc (diff)
downloaddexon-sol-tools-ab1f070901bf6dc6ba39abc1e0dd67c3c342a174.tar.gz
dexon-sol-tools-ab1f070901bf6dc6ba39abc1e0dd67c3c342a174.tar.zst
dexon-sol-tools-ab1f070901bf6dc6ba39abc1e0dd67c3c342a174.zip
Merge pull request #386 from 0xProject/fix/windows_install
Use system-independent rm command
-rw-r--r--packages/contracts/package.json3
-rw-r--r--packages/deployer/package.json3
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 7e7caa002..fd411f820 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -16,7 +16,7 @@
"run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit",
"compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
"compile": "node ../deployer/lib/src/cli.js compile --contracts-dir src/contracts --artifacts-dir src/artifacts",
- "clean": "rm -rf ./lib",
+ "clean": "shx rm -rf ./lib",
"generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken).json' --template contract_templates/contract.handlebars --partials 'contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated",
"migrate": "node ../deployer/lib/src/cli.js migrate",
"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
@@ -51,6 +51,7 @@
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"solc": "^0.4.18",
+ "shx": "^0.2.2",
"tslint": "5.8.0",
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index af5c33354..89dfd3ef1 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -9,7 +9,7 @@
"build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc",
"test": "npm run build; mocha lib/test/*_test.js",
"compile": "npm run build; node lib/src/cli.js compile",
- "clean": "rm -rf ./lib",
+ "clean": "shx rm -rf ./lib",
"migrate": "npm run build; node lib/src/cli.js migrate",
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
"test:circleci": "yarn test"
@@ -31,6 +31,7 @@
"@0xproject/tslint-config": "^0.4.9",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
+ "shx": "^0.2.2",
"mocha": "^4.0.1",
"tslint": "5.8.0",
"types-bn": "^0.0.1",