From ad4600fb9fada48beed6073d29765272ca5f6946 Mon Sep 17 00:00:00 2001
From: jahway603 <jahway603@protonmail.com>
Date: Sun, 18 Sep 2022 14:50:57 -0400
Subject: [PATCH 1/2] renamed to util

---
 Dockerfile                                   | 4 ++--
 Makefile.am                                  | 2 +-
 build.sh                                     | 2 +-
 {zcutil => util}/afl/afl-build.sh            | 0
 {zcutil => util}/afl/afl-get.sh              | 0
 {zcutil => util}/afl/afl-getbuildrun.sh      | 0
 {zcutil => util}/afl/afl-run.sh              | 0
 {zcutil => util}/afl/hush-wrapper            | 0
 {zcutil => util}/afl/hush-wrapper-g++        | 0
 {zcutil => util}/afl/hush-wrapper-gcc        | 0
 {zcutil => util}/build-arm.sh                | 0
 {zcutil => util}/build-debian-package-ARM.sh | 0
 {zcutil => util}/build-debian-package.sh     | 0
 {zcutil => util}/build-mac.sh                | 0
 {zcutil => util}/build-win.sh                | 0
 {zcutil => util}/build.sh                    | 0
 {zcutil => util}/docker-entrypoint.sh        | 0
 {zcutil => util}/docker-hush-cli.sh          | 0
 {zcutil => util}/dragon.txt                  | 0
 19 files changed, 4 insertions(+), 4 deletions(-)
 rename {zcutil => util}/afl/afl-build.sh (100%)
 rename {zcutil => util}/afl/afl-get.sh (100%)
 rename {zcutil => util}/afl/afl-getbuildrun.sh (100%)
 rename {zcutil => util}/afl/afl-run.sh (100%)
 rename {zcutil => util}/afl/hush-wrapper (100%)
 rename {zcutil => util}/afl/hush-wrapper-g++ (100%)
 rename {zcutil => util}/afl/hush-wrapper-gcc (100%)
 rename {zcutil => util}/build-arm.sh (100%)
 rename {zcutil => util}/build-debian-package-ARM.sh (100%)
 rename {zcutil => util}/build-debian-package.sh (100%)
 rename {zcutil => util}/build-mac.sh (100%)
 rename {zcutil => util}/build-win.sh (100%)
 rename {zcutil => util}/build.sh (100%)
 rename {zcutil => util}/docker-entrypoint.sh (100%)
 rename {zcutil => util}/docker-hush-cli.sh (100%)
 rename {zcutil => util}/dragon.txt (100%)

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

From d2478acea453301bcfff0c89ac975e430f5d5168 Mon Sep 17 00:00:00 2001
From: jahway603 <jahway603@protonmail.com>
Date: Sun, 18 Sep 2022 14:56:42 -0400
Subject: [PATCH 2/2] continued util change

---
 DEVELOPING.md                    |  2 +-
 util/afl/afl-build.sh            | 12 ++++++------
 util/afl/afl-get.sh              |  4 ++--
 util/afl/afl-getbuildrun.sh      |  6 +++---
 util/build-arm.sh                |  2 +-
 util/build-debian-package-ARM.sh |  2 +-
 util/build-debian-package.sh     |  2 +-
 util/build.sh                    |  6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/DEVELOPING.md b/DEVELOPING.md
index 0aae790f5..069fb7496 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -84,7 +84,7 @@ to generate new unix man pages for that version :
 
 After successfully compiling Hush, you can generate a debian package of these binaries with:
 
-	./zcutil/build-debian-package.sh
+	./util/build-debian-package.sh
 
 This command will not work on Mac OS X. Currently you cannot generate a Debian package
 from operating systems other than Linux. Oh well.
diff --git a/util/afl/afl-build.sh b/util/afl/afl-build.sh
index a64d47de3..74d5980ce 100755
--- a/util/afl/afl-build.sh
+++ b/util/afl/afl-build.sh
@@ -2,9 +2,9 @@
 # Copyright (c) 2016-2021 The Hush developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
-# A wrapper around ./zcutil/build.sh for instrumenting the build with AFL:
-#   ./zcutil/afl/afl-build.sh <directory where AFL is installed> <fuzz case>
-# You may obtain a copy of AFL using ./zcutil/afl/afl-get.sh.
+# A wrapper around ./util/build.sh for instrumenting the build with AFL:
+#   ./util/afl/afl-build.sh <directory where AFL is installed> <fuzz case>
+# You may obtain a copy of AFL using ./util/afl/afl-get.sh.
 
 set -eu -o pipefail
 
@@ -12,11 +12,11 @@ export AFL_INSTALL_DIR=$(realpath "$1")
 FUZZ_CASE="$2"
 shift 2
 export AFL_LOG_DIR="$(pwd)"
-export ZCUTIL=$(realpath "./zcutil")
+export UTIL=$(realpath "./util")
 
 cp "./src/fuzzing/$FUZZ_CASE/fuzz.cpp" src/fuzz.cpp
 
-CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main" "$ZCUTIL/build.sh" "CC=$ZCUTIL/afl/hush-wrapper-gcc" "CXX=$ZCUTIL/afl/hush-wrapper-g++" AFL_HARDEN=1 "$@"
+CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main" "$UTIL/build.sh" "CC=$UTIL/afl/hush-wrapper-gcc" "CXX=$UTIL/afl/hush-wrapper-g++" AFL_HARDEN=1 "$@"
 
 echo "You can now run AFL as follows:"
-echo "$ ./zcutil/afl/afl-run.sh '$AFL_INSTALL_DIR' '$FUZZ_CASE'"
+echo "$ ./util/afl/afl-run.sh '$AFL_INSTALL_DIR' '$FUZZ_CASE'"
diff --git a/util/afl/afl-get.sh b/util/afl/afl-get.sh
index 255adeb17..0156b5105 100755
--- a/util/afl/afl-get.sh
+++ b/util/afl/afl-get.sh
@@ -3,7 +3,7 @@
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 # Obtains and builds a copy of AFL from source.
-#   ./zcutil/afl/afl-get.sh <directory to build and install AFL in>
+#   ./util/afl/afl-get.sh <directory to build and install AFL in>
 
 set -eu -o pipefail
 
@@ -32,5 +32,5 @@ make
 
 echo "You can now build hushd with AFL instrumentation as follows:"
 echo "$ make clean # if you've already built hushd without AFL instrumentation"
-echo "$ ./zcutil/afl/afl-build.sh '$(pwd)' <fuzz case> -j\$(nproc)"
+echo "$ ./util/afl/afl-build.sh '$(pwd)' <fuzz case> -j\$(nproc)"
 echo "...where <fuzz case> is the name of a directory in src/fuzzing."
diff --git a/util/afl/afl-getbuildrun.sh b/util/afl/afl-getbuildrun.sh
index de9dba15b..5bd1986f9 100755
--- a/util/afl/afl-getbuildrun.sh
+++ b/util/afl/afl-getbuildrun.sh
@@ -16,8 +16,8 @@ export AFL_INSTALL_DIR=$(realpath "./afl-temp")
 
 if [ ! -d "$AFL_INSTALL_DIR" ]; then
     mkdir "$AFL_INSTALL_DIR"
-    ./zcutil/afl/afl-get.sh "$AFL_INSTALL_DIR"
+    ./util/afl/afl-get.sh "$AFL_INSTALL_DIR"
 fi
 
-./zcutil/afl/afl-build.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" -j$(nproc)
-./zcutil/afl/afl-run.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" "$@"
+./util/afl/afl-build.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" -j$(nproc)
+./util/afl/afl-run.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" "$@"
diff --git a/util/build-arm.sh b/util/build-arm.sh
index c721b3e57..a3a1b927b 100755
--- a/util/build-arm.sh
+++ b/util/build-arm.sh
@@ -22,7 +22,7 @@ EOF
 
 if [ "x$*" = 'x--help' ]
 then
-    cat ./zcutil/dragon.txt
+    cat ./util/dragon.txt
     cat <<EOF
 Welcome To The Hush Build System, Here Be Dragons!
 Usage:
diff --git a/util/build-debian-package-ARM.sh b/util/build-debian-package-ARM.sh
index a2f9629cf..f876c68d0 100755
--- a/util/build-debian-package-ARM.sh
+++ b/util/build-debian-package-ARM.sh
@@ -4,7 +4,7 @@
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #
 # Remix for SBC (Single Board Computer) like PineBook, Rock64, Raspberry Pi, etc.
-## Usage: ./zcutil/build-debian-package-ARM.sh
+## Usage: ./util/build-debian-package-ARM.sh
 
 # Pre-requisite checks
 # Check if lintian is installed and exit if it is not
diff --git a/util/build-debian-package.sh b/util/build-debian-package.sh
index bce7f5e72..271ccfb2a 100755
--- a/util/build-debian-package.sh
+++ b/util/build-debian-package.sh
@@ -2,7 +2,7 @@
 # Copyright (c) 2016-2021 The Hush developers
 # Distributed under the GPLv3 software license, see the accompanying
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
-## Usage: ./zcutil/build-debian-package.sh
+## Usage: ./util/build-debian-package.sh
 
 echo "Let There Be Hush Debian Packages"
 
diff --git a/util/build.sh b/util/build.sh
index 42f4196b3..214eef6c1 100755
--- a/util/build.sh
+++ b/util/build.sh
@@ -40,13 +40,13 @@ gprefix READLINK readlink
 cd "$(dirname "$("$READLINK" -f "$0")")/.."
 
 # Allow user overrides to $MAKE. Typical usage for users who need it:
-#   MAKE=gmake ./zcutil/build.sh -j$(nproc)
+#   MAKE=gmake ./util/build.sh -j$(nproc)
 if [[ -z "${MAKE-}" ]]; then
     MAKE=make
 fi
 
 # Allow overrides to $BUILD and $HOST for porters. Most users will not need it.
-#   BUILD=i686-pc-linux-gnu ./zcutil/build.sh
+#   BUILD=i686-pc-linux-gnu ./util/build.sh
 if [[ -z "${BUILD-}" ]]; then
     BUILD="$(./depends/config.guess)"
 fi
@@ -61,7 +61,7 @@ fi
 
 if [ "x$*" = 'x--help' ]
 then
-    cat ./zcutil/dragon.txt
+    cat ./util/dragon.txt
     cat <<EOF
 Welcome To The Hush Build System, Here Be Dragons!
 Usage: