Merge branch 'dev' into danger

util/build-debian-package.sh

@@ -4,7 +4,7 @@
 # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 ## Usages:
 ##  ./util/build-debian-package.sh               # build amd64 package
-##  ARCH=aarch64 ./util/build-debian-package.sh  # build package for specific archiecture
+##  ./util/build-debian-package.sh aarch64       # build package for specific archiecture
 
 ARCH=${1:-amd64}
 echo "Let There Be Hush Debian Packages"

util/build.sh

@@ -11,6 +11,12 @@ if ! [ -x "$(command -v cmake)" ]; then
   exit 1
 fi
 
+if ! [ -x "$(command -v autoreconf)" ]; then
+  echo 'Error: autoconf is not installed. Install autoconf and try again.' >&2
+  echo 'On Debian-like systems: apt install autoconf' >&2
+  exit 1
+fi
+
 function cmd_pref() {
     if type -p "$2" > /dev/null; then
         eval "$1=$2"

util/gen-linux-binary-release.sh

@@ -8,7 +8,8 @@ set -x
 #hardcode and uncomment if hushd is not running on this machine
 #VERSION=3.6.3
 VERSION=$(./src/hushd --version|grep version|cut -d' ' -f4|cut -d- -f1|sed 's/v//g')
-FILE="hush-$VERSION-linux-amd64.tar"
+DIR="hush-$VERSION-linux-amd64"
+FILE="$DIR.tar"
 TIME=$(perl -e 'print time')
 
 if [ -d "build" ]
@@ -17,14 +18,17 @@ then
     echo "Moved existing build/ dir to build.$TIME"
 fi
 mkdir build
-echo "Created new build/ dir"
-cp contrib/asmap/asmap.dat build/
-cp sapling*.params build/
+BUILD="build/$DIR"
+mkdir $BUILD
+echo "Created new build dir $BUILD"
+cp contrib/asmap/asmap.dat $BUILD
+cp sapling*.params $BUILD
 cd src
-cp hushd hush-cli hush-tx hush-smart-chain dragonx-cli dragonxd ../build
-cd ../build
+cp hushd hush-cli hush-tx hush-smart-chain dragonx-cli dragonxd ../$BUILD
+cd ../$BUILD
 strip hushd hush-cli hush-tx
-tar -f $FILE -c  *
+cd ..
+tar -f $FILE -c  hush-$VERSION-linux-amd64/*
 gzip -9 $FILE
 sha256sum *.gz
 du -sh *.gz