diff --git a/install.escript b/install.escript index f8fcebf..7181889 100755 --- a/install.escript +++ b/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"); diff --git a/packup b/packup index bbe2964..54a2baa 100755 --- a/packup +++ b/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]), - halt(0); -main(_) -> - ok = io:format("Provide a single version or extension string as an argument.~n"), - halt(1). + ok = io:format("~ts~n", [Zip]), + halt(0). diff --git a/uninstall_unix b/uninstall_unix new file mode 100755 index 0000000..eca5175 --- /dev/null +++ b/uninstall_unix @@ -0,0 +1,5 @@ +#! /bin/sh + +rm -f "$HOME/bin/zx" +rm -f "$HOME/bin/zxh" +rm -rf "$HOME/zomp" diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 0c62199..0d91a54 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.2.1 +0.3.0 diff --git a/zomp/lib/otpr/zx/0.2.1/Emakefile b/zomp/lib/otpr/zx/0.3.0/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/Emakefile rename to zomp/lib/otpr/zx/0.3.0/Emakefile diff --git a/zomp/lib/otpr/zx/0.2.1/LICENSE b/zomp/lib/otpr/zx/0.3.0/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/LICENSE rename to zomp/lib/otpr/zx/0.3.0/LICENSE diff --git a/zomp/lib/otpr/zx/0.2.1/ebin/zx.app b/zomp/lib/otpr/zx/0.3.0/ebin/zx.app similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/ebin/zx.app rename to zomp/lib/otpr/zx/0.3.0/ebin/zx.app diff --git a/zomp/lib/otpr/zx/0.2.1/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.3.0/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.3.0/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.2.1/make_zx b/zomp/lib/otpr/zx/0.3.0/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/make_zx rename to zomp/lib/otpr/zx/0.3.0/make_zx diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx.erl b/zomp/lib/otpr/zx/0.3.0/src/zx.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx.erl index 32f19e1..ebe6d2b 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx.erl +++ b/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 "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_auth.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_auth.erl index 685d0a9..93c98d1 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_auth.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_conn.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_conn.erl index 0a06a42..f800b3a 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_conn.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_conn_sup.erl index 6d66560..ed93147 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_conn_sup.erl +++ b/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 "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_daemon.erl index 36f6cde..bf97dc4 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_daemon.erl +++ b/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 "). -copyright("Craig Everett "). @@ -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). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_key.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_key.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_key.erl index c3293f9..1b577b1 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_key.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_lib.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_lib.erl index 73c8c05..2ef6ceb 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_lib.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_local.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_local.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_local.erl index 098f8ec..9a9e740 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_local.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_net.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_net.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_net.erl index 2d4f897..7f17a2f 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_net.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_peer.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_peer.erl index bbf1ca5..f297d7a 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_peer.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_peer_man.erl index 90b8a7d..3b35ff9 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_peer_man.erl +++ b/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 "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_peer_sup.erl index 36af705..338aebb 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_peer_sup.erl +++ b/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 "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_peers.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_peers.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_peers.erl index ee8d862..3dd6298 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_peers.erl +++ b/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 "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_proxy.erl index 72d2e91..bd4e682 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_proxy.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_sup.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_sup.erl index e352428..7f311f3 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_sup.erl +++ b/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 "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_tty.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.2.1/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_tty.erl index 7c51ba7..72314d4 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_tty.erl +++ b/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 "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.2.1/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.3.0/src/zx_zsp.erl similarity index 98% rename from zomp/lib/otpr/zx/0.2.1/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.3.0/src/zx_zsp.erl index f1e8f37..e4f5963 100644 --- a/zomp/lib/otpr/zx/0.2.1/src/zx_zsp.erl +++ b/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 "). -copyright("Craig Everett "). -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), diff --git a/zomp/lib/otpr/zx/0.2.1/templates/Emakefile b/zomp/lib/otpr/zx/0.3.0/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/Emakefile rename to zomp/lib/otpr/zx/0.3.0/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.2.1/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.3.0/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.3.0/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/escript b/zomp/lib/otpr/zx/0.3.0/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/escript rename to zomp/lib/otpr/zx/0.3.0/templates/escript diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/client.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/client.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/client.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/client_man.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/client_man.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/client_man.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/client_sup.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/client_sup.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/client_sup.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/clients.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/clients.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/clients.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/src/client.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/src/client.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/src/client_man.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/src/client_man.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_man.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/src/client_sup.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/src/client_sup.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/src/client_sup.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/src/clients.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/src/clients.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/src/clients.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/src/sup.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/src/sup.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/example_server/sup.erl b/zomp/lib/otpr/zx/0.3.0/templates/example_server/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/example_server/sup.erl rename to zomp/lib/otpr/zx/0.3.0/templates/example_server/sup.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/gitignore b/zomp/lib/otpr/zx/0.3.0/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/gitignore rename to zomp/lib/otpr/zx/0.3.0/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.2.1/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.3.0/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.3.0/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/hellowx/src/con.erl b/zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/hellowx/src/con.erl rename to zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/con.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/hellowx/src/gui.erl b/zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/hellowx/src/gui.erl rename to zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/gui.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/hellowx/src/sup.erl b/zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/hellowx/src/sup.erl rename to zomp/lib/otpr/zx/0.3.0/templates/hellowx/src/sup.erl diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.3.0/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.3.0/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.2.1/templates/simplecli.erl b/zomp/lib/otpr/zx/0.3.0/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.3.0/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.2.1/zomp.meta b/zomp/lib/otpr/zx/0.3.0/zomp.meta similarity index 100% rename from zomp/lib/otpr/zx/0.2.1/zomp.meta rename to zomp/lib/otpr/zx/0.3.0/zomp.meta diff --git a/zomp/zx b/zomp/zx index 8be2164..be1e2ad 100755 --- a/zomp/zx +++ b/zomp/zx @@ -1,6 +1,10 @@ #!/bin/bash -. "$HOME"/.bash_profile +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" diff --git a/zomp/zxh b/zomp/zxh index 4b11a00..76ae970 100755 --- a/zomp/zxh +++ b/zomp/zxh @@ -1,6 +1,10 @@ #!/bin/sh -. "$HOME"/.bash_profile +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"