version 1.4 upgrade

4 files changed, 45 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4bcf361cce4f..d269bb9faec9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jan  8 21:15:53 UTC 2017
+# Mon Mar 13 01:20:12 UTC 2017
 pkgbase = ninjaos-bootandnuke
 	pkgdesc = Ninja Boot'n'Nuke. Boot'n'Nuke implemented as an initcpio image.
-	pkgver = 1.3
+	pkgver = 1.4
 	pkgrel = 1
 	url = http://ninjaos.org/projects.html#bootandnuke
 	install = ninjaos-bootandnuke.install
@@ -17,10 +17,12 @@ pkgbase = ninjaos-bootandnuke
 	provides = mkinitcpio-nban
 	conflicts = mkinitcpio-nban
 	replaces = mkinitcpio-nban
-	source = http://ninjaos.org/downloads/projects/ninjaos-bootandnuke-1.3.tar.gz
+	source = http://ninjaos.org/downloads/projects/ninjaos-bootandnuke-1.4.tar.gz
+	source = http://ninjaos.org/downloads/projects/ninjaos-bootandnuke-1.4.tar.gz.sig
 	source = README
-	sha256sums = b121311063c7ecaa971d1786e5f3dcc8278c1e515c7969689b48ea05e438fb7c
-	sha256sums = 1b28d8f101675d9c6c915df9f36d9a417fa38ce96561570f65e077848a7d4aaa
+	sha256sums = 64dc4c79c8d90a7bd510d7e046b8e70d57354043fa12aa6c18de4e5c301da841
+	sha256sums = SKIP
+	sha256sums = 93e1fe5810a837399724d1e6fb9403aa68e852c731b93656c6667ea4bea2b075
 
 pkgname = ninjaos-bootandnuke
 
diff --git a/PKGBUILD b/PKGBUILD
index f9147b476004..a36830ca138f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@
 # This is very much a valid security tool, and its very well documented.
 
 pkgname=ninjaos-bootandnuke
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="Ninja Boot'n'Nuke. Boot'n'Nuke implemented as an initcpio image."
 url="http://ninjaos.org/projects.html#bootandnuke"
@@ -34,9 +34,11 @@ replaces=("mkinitcpio-nban")
 conflicts=("mkinitcpio-nban")
 provides=("mkinitcpio-nban")
 source=("http://ninjaos.org/downloads/projects/${pkgname}-${pkgver}.tar.gz"
+        "http://ninjaos.org/downloads/projects/${pkgname}-${pkgver}.tar.gz.sig"
         "README")
-sha256sums=('b121311063c7ecaa971d1786e5f3dcc8278c1e515c7969689b48ea05e438fb7c'
-            '1b28d8f101675d9c6c915df9f36d9a417fa38ce96561570f65e077848a7d4aaa')
+sha256sums=('64dc4c79c8d90a7bd510d7e046b8e70d57354043fa12aa6c18de4e5c301da841'
+            'SKIP'
+            '93e1fe5810a837399724d1e6fb9403aa68e852c731b93656c6667ea4bea2b075')
 validpgpkeys=('D5E76841665A4408D73C2D8796FD6113A1F8331E')
 package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/README b/README
index 4d83e48feaf0..454a5255a770 100644
--- a/README
+++ b/README
@@ -1,6 +1,8 @@
-		-= Ninja Boot and Nuke =-
+		-= Ninja Boot'N'Nuke =-
 
-Ninja Boot and Nuke is and "End of Life" solution that is built around Arch
+NBAN WILL IRRECOVABLY DESTROY ALL DATA ON ALL ATTACHED DRIVES
+
+Ninja Boot'N'Nuke(NBAN) is and "End of Life" solution that is built around Arch
 native tools. The end result is to wipe all data from all attached storage
 media by zerofilling them. If SATA secure erase is available, then that is used
 instead. This will secure data off machines which are no longer in use, but
@@ -9,7 +11,9 @@ have sensative data, for allow for their disposal.
 The core NBAN image is an initcpio profile, that loads storage drivers, and then
 uses dd in parallel to overwrite all drives with zeros and then reboots.
 
-There are several ways this can be utilized.
+NBAN WILL IRRECOVABLY DESTROY ALL DATA ON ALL ATTACHED DRIVES
+
+	-USAGE-
 
 1. Compile nban directly with mkinitcpio
 
@@ -35,11 +39,26 @@ overwrite your bootloader and reboot into boot and nuke. reboot_nuke_press.sh
 is designed to be tied to a button that will nuke after a certain about of
 repeated button presses. This is for tying to keyboard shortcuts. You can use
 these to santize your Arch workstation quickly in case of an event requiring
-immediate santiation of data
+immediate santiation of data.
+
+The default is 3 button presses in 0.8 seconds.
 
-The default is 3 button presses in 0.8 seconds. these scripts are found in:
+	-CONFIG-
+Configuration is at the top of all scripts, except the initcpio profiles which
+you can edit in their /etc/ directory. See -FILES- Below for more details
 
+	-FILES-
+-+ Core scripts
+/usr/share/ninjaos/bootanuke.sh - main script that does the wiping.
+/usr/share/ninjaos/shurikenforge.sh - shuriken_forge command
+
+-+ Arch Linux initcpio profile
+/etc/mkinitcpio.d/nban.conf
+/etc/mkinitcpio.d/nban.preset
+/usr/lib/initcpio/hooks/nban
+/usr/lib/initcpio/install/nban
+
+-+ Auto Reboot
 /usr/share/ninjaos/reboot_nuke.sh
 /usr/share/ninjaos/reboot_nuke_press.sh
 
-
diff --git a/ninjaos-bootandnuke.install b/ninjaos-bootandnuke.install
index cdfcdb4aa285..92c327ea5aa9 100644
--- a/ninjaos-bootandnuke.install
+++ b/ninjaos-bootandnuke.install
@@ -1,19 +1,20 @@
 #!/usr/bin/bash
 post_install() {
-    ln -s /usr/share/ninjaos/shuriken_forge.sh /usr/bin/shuriken_forge
-    package_help
+  ln -s /usr/share/ninjaos/shuriken_forge.sh /usr/bin/shuriken_forge
+  package_help
 }
 
 post_upgrade() {
-    package_help
+  pre_remove
+  post_install
 }
 
 pre_remove(){
-    rm -f /usr/bin/shuriken_forge
+  rm -f /usr/bin/shuriken_forge
 }
 
 package_help() {
-    cat << EOF
+  cat << EOF
 	=Ninja Boot and Nuke=
 Spun off from Ninja OS(http://ninjaos.org) as a stand along package. This
 package has both the mkinitcpio profile for NBAN, and the shuriken creation tool
@@ -23,7 +24,8 @@ package has both the mkinitcpio profile for NBAN, and the shuriken creation tool
 
 * Build a shuriken: shuriken_forge </dev/sdX>
 
-See shuriken_forge --help for more information.
+See shuriken_forge --help, man 7 nban, and man 1 shuriken_forge for more
+information.
 
 EOF
 }