From ee48ef241fbb633b276d2bb1ec03789429824e05 Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Sat, 1 Jun 2019 15:20:27 -0700
Subject: [PATCH] bring back buildwrapper as a wrapper for external scripts

---
 buildwrapper.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/buildwrapper.sh b/buildwrapper.sh
index b0e0c9d..f23fe24 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+<<<<<<< Updated upstream
 read -p "Enter Server CN (localhost or address): " SRVNAME
 read -p "Enter Client CN (localhost or address): " CLTNAME
 
@@ -132,3 +133,8 @@ chmod +x staging/server/server
 
 echo "[+] removing test logs"
 rm JobServ-Server-*
+=======
+./certs-gen.sh
+./gradlew clean build
+./package.sh
+>>>>>>> Stashed changes