From 4b6f3433c6b870f6e2c521553bf2b97c820efcfb Mon Sep 17 00:00:00 2001
From: DarkFeather <darkfeather@aninix.net>
Date: Wed, 1 May 2019 16:39:45 -0500
Subject: [PATCH] Updating build structure for AniNIX::Uniglot rename and
 AniNIX::Maat/Builder

---
 Makefile | 18 ++++++++----------
 PKGBUILD |  9 ++++++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 93dc018..f15194c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,15 @@
-INSTALLER != curl -s https://aninix.net/foundation/installer-test.bash | /bin/bash
-
-compile: clean /usr/bin/mcs CryptoWorkbench.csharp
-	if [ ! -d ../SharedLibraries ]; then git -C /usr/local/src clone https://aninix.net/foundation/SharedLibraries; fi
-	git -C /usr/local/src/SharedLibraries pull
-	/usr/bin/mcs -out:cryptoworkbench.exe ../SharedLibraries/CSharp/*.csharp *.csharp 2>&1
+compile: /usr/bin/mcs CryptoWorkbench.csharp /opt/aninix/Uniglot/
+	/usr/bin/mcs -out:cryptoworkbench.exe /opt/aninix/Uniglot/CSharp/*.csharp *.csharp 2>&1
 	
 test: /usr/bin/mono compile
+	# TODO This needs to be a pytest battery across the input.
 	echo quit | /usr/bin/mono cryptoworkbench.exe ./sample.txt
 
 clean:
-	if [ -f cryptoworkbench.exe ]; then rm cryptoworkbench.exe; fi
+	for i in `cat .gitignore`; do rm -Rf $$i; done
 
 install: compile /bin/bash bash.cryptoworkbench
-	mkdir -p ${pkgdir}/opt ${pkgdir}/usr/local/bin/ ${pkgdir}/usr/local/bin/
+	mkdir -p ${pkgdir}/opt ${pkgdir}/usr/local/bin/ 
 	mv cryptoworkbench.exe ${pkgdir}/opt
 	cp bash.cryptoworkbench ${pkgdir}/usr/local/bin/cryptoworkbench
 	cp captivecrypto.bash ${pkgdir}/usr/local/bin/captivecrypto
@@ -22,9 +19,10 @@ checkperm:
 	chmod 0555 ${pkgdir}/opt/cryptoworkbench.exe ${pkgdir}/usr/local/bin/cryptoworkbench ${pkgdir}/usr/local/bin/captivecrypto
 	chown root:root ${pkgdir}/usr/local/bin/captivecrypto ${pkgdir}/opt/cryptoworkbench.exe
 
-sshuser: install ForceCommand.txt
+sshuser: install ForceCommand.txt pwgen
 	grep captivecrypto /etc/shells || echo '/usr/local/bin/captivecrypto' /etc/shells
-	id crypto || useradd -k -d /home/crypto -s /usr/local/bin/captivecrypto crypto
+	if ! id crypto &>/dev/null; then useradd -k -d /home/crypto -s /usr/local/bin/captivecrypto crypto;  fi
+	echo "crypto:$(pwgen 24 1)" | chpasswd;
 	cat ./ForceCommand.txt >> /etc/ssh/sshd_config
 	echo crypto | passwd --stdin crypto
 	
diff --git a/PKGBUILD b/PKGBUILD
index 73e3585..8aa02ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,9 @@
 # Maintainer: Shikoba Kage <darkfeather@aninix.net>
 pkgname=cryptoworkbench
-pkgver=0.1."$(git rev-parse HEAD)"
+pkgver=0.1.c1ed369
+pkgver() {
+    printf "0.1.""$(git rev-parse --short HEAD)"
+}
 pkgrel=1
 epoch=
 pkgdesc="AniNIX::CryptoWorkbench \\\\ Simple Cryptography Utility"
@@ -8,7 +11,7 @@ arch=("x86_64")
 url="https://aninix.net/foundation/CryptoWorkbench"
 license=('custom')
 groups=()
-depends=('mono>=5.0.0' 'curl' 'grep' 'bash>=4.4' 'git>=2.13')
+depends=('mono>=5.0.0' 'curl' 'grep' 'bash>=4.4' 'git>=2.13' 'uniglot')
 makedepends=('make>=4.2')
 checkdepends=()
 optdepends=()
@@ -33,7 +36,7 @@ build() {
 }
 
 check() {
-	printf 'quit\n\n' | make -C .. test
+	printf 'quit\n\n' | make -C "${srcdir}/.." test
 }
 
 package() {