Add uninstall script; fix typos

install.escript

@@ -117,7 +117,7 @@ os_cmd(Command) ->
 
 zomp_dir({unix, _}) ->
     Home = os:getenv("HOME"),
-    filename:join(Home, ".zomp");
+    filename:join(Home, "zomp");
 zomp_dir({win32, _}) ->
     Path = os:getenv("LOCALAPPDATA"),
     filename:join(Path, "zomp");

packup

@@ -1,13 +1,16 @@
 #! /usr/bin/env escript
 
 
-main([Version]) ->
+main(_) ->
+    {ok, BV} = file:read_file("zomp/etc/version.txt"),
+    Version = string:strip(binary_to_list(BV), both, $\n),
     Tar = "zomp.tar.gz",
     ok = erl_tar:create(Tar, ["zomp"], [compressed]),
     Zip = "zx-" ++ Version ++ ".zip",
     ZipFiles =
         ["install.escript",
          "install_unix",
+         "uninstall_unix",
          "install_windows.cmd",
          "notify.vbs",
          "README.md",
@@ -17,8 +20,5 @@ main([Version]) ->
          Tar],
     {ok, Zip} = zip:create(Zip, ZipFiles),
     ok = file:delete(Tar),
-    ok = io:format("Wrote ~ts.~n", [Zip]),
+    ok = io:format("~ts~n", [Zip]),
-    halt(0);
+    halt(0).
-main(_) ->
-    ok = io:format("Provide a single version or extension string as an argument.~n"),
-    halt(1).

uninstall_unix

@@ -0,0 +1,5 @@
+#! /bin/sh
+
+rm -f "$HOME/bin/zx"
+rm -f "$HOME/bin/zxh"
+rm -rf "$HOME/zomp"

zomp/etc/version.txt

@@ -1 +1 @@
-0.2.1
+0.3.0

zomp/lib/otpr/zx/0.3.0/src/zx.erl

@@ -24,7 +24,7 @@
 %%% @end
 
 -module(zx).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behavior(application).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.3.0/src/zx_auth.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_auth).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_conn.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_conn).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_conn_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_conn_sup).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.3.0/src/zx_daemon.erl

@@ -138,7 +138,7 @@
 %%% @end
 
 -module(zx_daemon).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
@@ -2435,6 +2435,7 @@ cx_store_cache(#cx{realms = Realms, hosts = Hosts}) ->
 cx_write_cache({Realm, #rmeta{serial = Serial}}) ->
     CacheFile = cx_realm_cache(Realm),
     CacheMeta = [{serial, Serial}],
+    ok = filelib:ensure_dir(CacheFile),
     zx_lib:write_terms(CacheFile, CacheMeta).
 
 

zomp/lib/otpr/zx/0.3.0/src/zx_key.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_key).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_lib.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_lib).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_local.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_local).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_net.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_net).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_peer.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_peer).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_peer_man.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_peer_man).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.3.0/src/zx_peer_sup.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_peer_sup).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behaviour(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.3.0/src/zx_peers.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_peers).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.3.0/src/zx_proxy.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_proxy).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_sup).
--vsn("0.2.1").
+-vsn("0.3.0").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.3.0/src/zx_tty.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_tty).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.3.0/src/zx_zsp.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_zsp).
--vsn("0.2.1").
+-vsn("0.3.0").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").
@@ -292,11 +292,10 @@ resign(_, _, _) ->
 resign2(Realm, KeyName, Key, MetaBin, TarGZ) ->
     case zx_lib:b_to_ts(MetaBin) of
         {ok, Meta} -> resign3(Realm, KeyName, Key, Meta, TarGZ);
-        {ok, _}    -> {error, bad_realm};
         error      -> {error, bad_zsp}
     end.
 
-resign3(Realm, KeyName, Key, Meta = #{package_id = {_, Name, Version}}, TarGZ) ->
+resign3(Realm, KeyName, Key, Meta = #{package_id := {_, Name, Version}}, TarGZ) ->
     NewMeta = Meta#{package_id := {Realm, Name, Version}, key_name := KeyName},
     MetaBin = term_to_binary(NewMeta),
     MetaSize = byte_size(MetaBin),

zomp/zx

@@ -1,6 +1,10 @@
 #!/bin/bash
 
+if [ -f "$HOME/.bash_profile" ]
+then
     . "$HOME"/.bash_profile
+fi
+
 export ZOMP_DIR="${ZOMP_DIR:-$HOME/zomp}"
 export ZX_VERSION=$(cat "$ZOMP_DIR/etc/version.txt")
 export ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$ZX_VERSION"

zomp/zxh

@@ -1,6 +1,10 @@
 #!/bin/sh
 
+if [ -f "$HOME/.bash_profile" ]
+then
     . "$HOME"/.bash_profile
+fi
+
 export ZOMP_DIR="${ZOMP_DIR:-$HOME/zomp}"
 export ZX_VERSION=$(cat "$ZOMP_DIR/etc/version.txt")
 export ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$ZX_VERSION"