From e473cdafc33ee36b19bfabb8b572ae60e24e345f Mon Sep 17 00:00:00 2001
From: Craig Everett <zxq9@zxq9.com>
Date: Mon, 20 Jan 2020 20:52:02 +0900
Subject: [PATCH] Tidying up

---
 packup                      | 14 ++++++++------
 get_zx => unix/get_zx       |  3 ++-
 install => unix/install     |  0
 uninstall => unix/uninstall |  0
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename get_zx => unix/get_zx (83%)
 rename install => unix/install (100%)
 rename uninstall => unix/uninstall (100%)

diff --git a/packup b/packup
index 02752cd..1052583 100755
--- a/packup
+++ b/packup
@@ -1,15 +1,17 @@
 #! /bin/bash
 
 version=$(head -n1 zomp/etc/version.txt)
-name=zx-"$version"
-archive_gz="$name".tar.gz
-archive_xz="$name".tar.xz
+name="zx-$version"
+archive_gz="$name.tar.gz"
+archive_xz="$name.tar.xz"
 tmpdir=$(mktemp -d)
-zxtmp="$tmpdir"/"$name"
+zxtmp="$tmpdir/$name"
 mkdir "$zxtmp"
 cp -r zomp "$zxtmp"
-cp -r unix "$zxtmp"
-cp install uninstall README.md LICENSE "$zxtmp" 
+mkdir "$zxtmp/unix"
+cp unix/zx "$zxtmp/unix/"
+cp unix/zxh "$zxtmp/unix/"
+cp unix/install unix/uninstall README.md LICENSE "$zxtmp" 
 tar -C "$tmpdir" -zcf "$PWD/$archive_gz" "$name"
 tar -C "$tmpdir" -Jcf "$PWD/$archive_xz" "$name"
 rm -rf "$tmpdir"
diff --git a/get_zx b/unix/get_zx
similarity index 83%
rename from get_zx
rename to unix/get_zx
index 5cc6721..91324b5 100755
--- a/get_zx
+++ b/unix/get_zx
@@ -7,7 +7,7 @@ version=0.9.1
 zx="zx-$version"
 tarball="$zx.tar.gz"
 
-wget "https://zxq9.com/projects/zomp/$tarball"
+wget -nv "https://zxq9.com/projects/zomp/$tarball"
 tar -zxf "$tarball"
 cd "$zx"
 chmod +x install
@@ -15,3 +15,4 @@ chmod +x install
 cd ..
 rm -rf "$zx"
 rm "$tarball"
+rm -- "$0"
diff --git a/install b/unix/install
similarity index 100%
rename from install
rename to unix/install
diff --git a/uninstall b/unix/uninstall
similarity index 100%
rename from uninstall
rename to unix/uninstall