From 906e0b925895d3a5941eda25f371fbafb3cbc22f Mon Sep 17 00:00:00 2001
From: Paragon Initiative Enterprises <security@paragonie.com>
Date: Tue, 13 Sep 2022 16:54:27 -0400
Subject: [PATCH] Fix build scripts

---
 build-phar.sh | 2 +-
 dist/Makefile | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build-phar.sh b/build-phar.sh
index 380eee63..c1ff20a5 100644
--- a/build-phar.sh
+++ b/build-phar.sh
@@ -4,5 +4,5 @@ curl -LSs https://box-project.github.io/box2/installer.php | php
 mkdir ~/box
 mv box.phar ~/box/box
 PATH=$PATH:~/box/ make -C dist/ build-phar
-# PATH=$PATH:~/box/ make -C dist/ sign-phar
+PATH=$PATH:~/box/ make -C dist/ sign-phar
 
diff --git a/dist/Makefile b/dist/Makefile
index f30a25dd..1678e12f 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -30,9 +30,14 @@ clean:
 # Inside workdir/:
 
 sodium-compat.phar: dist/box.json composer.lock
+	if [ ! -d dist ]; then mkdir dist; fi
+	if [ ! -f dist/box.json ]; then cp ../dist/box.json dist/box.json; fi
 	cp dist/box.json .
 	php -d phar.readonly=0 $(box) build -c box.json -v
 
+dist/box.json:
+	cp ../box.json box.json
+
 composer.lock:
 	$(composer) config autoloader-suffix $(gitcommit)
 	$(composer) install --no-dev