Tidying up

packup

@@ -1,15 +1,17 @@
 #! /bin/bash
 
 version=$(head -n1 zomp/etc/version.txt)
-name=zx-"$version"
+name="zx-$version"
-archive_gz="$name".tar.gz
+archive_gz="$name.tar.gz"
-archive_xz="$name".tar.xz
+archive_xz="$name.tar.xz"
 tmpdir=$(mktemp -d)
-zxtmp="$tmpdir"/"$name"
+zxtmp="$tmpdir/$name"
 mkdir "$zxtmp"
 cp -r zomp "$zxtmp"
-cp -r unix "$zxtmp"
+mkdir "$zxtmp/unix"
-cp install uninstall README.md LICENSE "$zxtmp" 
+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"

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"