diff --git a/Dockerfile b/Dockerfile index e1323ec2f..b89a159a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN ln -sf /hush/src/hushd /usr/bin/hushd && \ ln -sf /hush/src/hush-tx /usr/bin/hush-tx && \ ln -sf /hush/src/wallet-utility /usr/bin/hush-wallet-utility && \ ln -sf /hush/src/hush-smart-chain /usr/bin/hush-smart-chain && \ - ln -sf /hush/zcutil/docker-entrypoint.sh /usr/bin/entrypoint && \ - ln -sf /hush/zcutil/docker-hush-cli.sh /usr/bin/hush-cli + ln -sf /hush/util/docker-entrypoint.sh /usr/bin/entrypoint && \ + ln -sf /hush/util/docker-hush-cli.sh /usr/bin/hush-cli CMD ["entrypoint"] diff --git a/Makefile.am b/Makefile.am index bc04a0cdd..de977adfc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -233,7 +233,7 @@ endif endif dist_bin_SCRIPTS = -dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh +dist_noinst_SCRIPTS = autogen.sh util/build-debian-package.sh util/build.sh EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/hush $(DIST_DOCS) $(BIN_CHECKS) diff --git a/build.sh b/build.sh index 908ee2e15..1a2d1c8a0 100755 --- a/build.sh +++ b/build.sh @@ -4,4 +4,4 @@ # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html set -eu -o pipefail -./zcutil/build.sh --disable-tests $@ +./util/build.sh --disable-tests $@ diff --git a/zcutil/afl/afl-build.sh b/util/afl/afl-build.sh similarity index 100% rename from zcutil/afl/afl-build.sh rename to util/afl/afl-build.sh diff --git a/zcutil/afl/afl-get.sh b/util/afl/afl-get.sh similarity index 100% rename from zcutil/afl/afl-get.sh rename to util/afl/afl-get.sh diff --git a/zcutil/afl/afl-getbuildrun.sh b/util/afl/afl-getbuildrun.sh similarity index 100% rename from zcutil/afl/afl-getbuildrun.sh rename to util/afl/afl-getbuildrun.sh diff --git a/zcutil/afl/afl-run.sh b/util/afl/afl-run.sh similarity index 100% rename from zcutil/afl/afl-run.sh rename to util/afl/afl-run.sh diff --git a/zcutil/afl/hush-wrapper b/util/afl/hush-wrapper similarity index 100% rename from zcutil/afl/hush-wrapper rename to util/afl/hush-wrapper diff --git a/zcutil/afl/hush-wrapper-g++ b/util/afl/hush-wrapper-g++ similarity index 100% rename from zcutil/afl/hush-wrapper-g++ rename to util/afl/hush-wrapper-g++ diff --git a/zcutil/afl/hush-wrapper-gcc b/util/afl/hush-wrapper-gcc similarity index 100% rename from zcutil/afl/hush-wrapper-gcc rename to util/afl/hush-wrapper-gcc diff --git a/zcutil/build-arm.sh b/util/build-arm.sh similarity index 100% rename from zcutil/build-arm.sh rename to util/build-arm.sh diff --git a/zcutil/build-debian-package-ARM.sh b/util/build-debian-package-ARM.sh similarity index 100% rename from zcutil/build-debian-package-ARM.sh rename to util/build-debian-package-ARM.sh diff --git a/zcutil/build-debian-package.sh b/util/build-debian-package.sh similarity index 100% rename from zcutil/build-debian-package.sh rename to util/build-debian-package.sh diff --git a/zcutil/build-mac.sh b/util/build-mac.sh similarity index 100% rename from zcutil/build-mac.sh rename to util/build-mac.sh diff --git a/zcutil/build-win.sh b/util/build-win.sh similarity index 100% rename from zcutil/build-win.sh rename to util/build-win.sh diff --git a/zcutil/build.sh b/util/build.sh similarity index 100% rename from zcutil/build.sh rename to util/build.sh diff --git a/zcutil/docker-entrypoint.sh b/util/docker-entrypoint.sh similarity index 100% rename from zcutil/docker-entrypoint.sh rename to util/docker-entrypoint.sh diff --git a/zcutil/docker-hush-cli.sh b/util/docker-hush-cli.sh similarity index 100% rename from zcutil/docker-hush-cli.sh rename to util/docker-hush-cli.sh diff --git a/zcutil/dragon.txt b/util/dragon.txt similarity index 100% rename from zcutil/dragon.txt rename to util/dragon.txt