From ae7b1178285c8557e6b4af723b0ca7e964b23363 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Thu, 11 Jan 2018 19:09:31 +0900 Subject: [PATCH] Moving stuff around --- README.md | 66 +- README.unix | 29 + README.windows | 2 + install.escript | 119 ++++ install_unix | 9 + install_windows.cmd | 16 + notify.vbs | 2 + packup | 24 + zomp/key/otpr/otpr.1.package.pub.der | Bin 0 -> 2062 bytes zomp/key/otpr/otpr.1.realm.pub.der | Bin 0 -> 2062 bytes Emakefile => zomp/lib/otpr-zx/0.1.0/Emakefile | 0 zomp/lib/otpr-zx/0.1.0/LICENSE | 674 ++++++++++++++++++ {ebin => zomp/lib/otpr-zx/0.1.0/ebin}/zx.app | 0 .../lib/otpr-zx/0.1.0/include}/zx_logger.hrl | 0 {src => zomp/lib/otpr-zx/0.1.0/src}/zx.erl | 4 +- .../lib/otpr-zx/0.1.0/src}/zx_daemon.erl | 0 zmake => zomp/lib/otpr-zx/0.1.0/zmake | 0 zomp/otpr.realm | 22 + zx.bash => zomp/zx.sh | 4 +- zx_install.escript | 42 -- 20 files changed, 965 insertions(+), 48 deletions(-) create mode 100644 README.unix create mode 100644 README.windows create mode 100755 install.escript create mode 100755 install_unix create mode 100644 install_windows.cmd create mode 100644 notify.vbs create mode 100755 packup create mode 100644 zomp/key/otpr/otpr.1.package.pub.der create mode 100644 zomp/key/otpr/otpr.1.realm.pub.der rename Emakefile => zomp/lib/otpr-zx/0.1.0/Emakefile (100%) create mode 100644 zomp/lib/otpr-zx/0.1.0/LICENSE rename {ebin => zomp/lib/otpr-zx/0.1.0/ebin}/zx.app (100%) rename {include => zomp/lib/otpr-zx/0.1.0/include}/zx_logger.hrl (100%) rename {src => zomp/lib/otpr-zx/0.1.0/src}/zx.erl (99%) rename {src => zomp/lib/otpr-zx/0.1.0/src}/zx_daemon.erl (100%) rename zmake => zomp/lib/otpr-zx/0.1.0/zmake (100%) create mode 100644 zomp/otpr.realm rename zx.bash => zomp/zx.sh (86%) delete mode 100644 zx_install.escript diff --git a/README.md b/README.md index dcd052b..7ab57e7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,64 @@ -# zx -Zomp user client +ZX: The Zomp client. + +Project information can be found at https://zxq9com/zx/ and https://github.com/zxq9/zx/ + + +ZX is delivered as a zip file containing: +- `zomp.tar.gz`: An archive of a current working zx/zomp installation +- `install.escript`: The main installation script +- `install_unix` and `install_windows.cms`: System-specific installation starters +- `README.*` files such as this one +- `LICENSE` +- `notify.vbs`: A hacky VBS script to communicate with the Windows GUI during setup + + +Installation + +To install ZX the `install.escript` program needs to run. In order to run it requires +an Erlang environment to be envoked via the Escript interpreter. The system-specific +installation starter scripts exist to locate the Erlang installation on the local +system. + +The installer will unpack the ZX client and the relevant parts of Zomp (the package +system underlying everything) to a directory in your home directory called "zomp". +Once everything is unpacked it will add a link called `zx` to your command environment +so that you can invoke zx the normal way. + +For further information about installation, consult the relevant README file in this +directory. + + +Features + +ZX has a number of features, most of them useful to developers and testers, but the +most important feature is for users of programs. To run any program from a configured +Zomp realm you run the command: + `zx run [program_name]` + +If the version number of the program is omitted (the typical case) then the latest +version will always be installed and run. If a version number is provided then that +specific version will be installed and run. + +ZX updates itself in the same manner it updates other installed programs. Occasionally +you may receive a message indicating that you should re-run ZX because a newer version +has been installed. + +At the moment ZX only works from the command line, though desktop links to launchers +for GUI programs can be easily created. + +To create a desktop launcher for a program the launcher must invoke zx the same way +you do from the command line: + `zx run [program_name]` + +In the event you need to write an installer for a system you have released through a +Zomp repository all the installer needs to do is provide an icon set and create a +launcher for the program that invokes zx the same way you would from the command line. + +The default Zomp realm is called "otpr". It is installed automatically and contains +only FOSS software. + + +ZX supports fetching and resolution of multiple realms at the same time, similar to +how Linux distribution package managers usually permit configuration of multiple +repository sources. To create and host your own, possibly private or proprietary, Zomp +realm consult the Zomp documentation directly. diff --git a/README.unix b/README.unix new file mode 100644 index 0000000..6dfac7e --- /dev/null +++ b/README.unix @@ -0,0 +1,29 @@ +Unix installation information for ZX + + +This file contains information about how to install and run ZX on a Unix-type system. +Consult README.md for general information about ZX as a program and as a project. + +Current versions of ZX and this file can be found at https://zxq9.com/zx/ + + +The unix startup script, "install_unix", is a BASH script and must be set as executable +to be used. To set the script as executable: + + +From the command line: + +To set the file permission correctly you will need to run the following command: + chmod +x install_unix +Then to execute the installer you will need to run the following command: + ./install_unix + + +From a GUI: + +If you are using a GUI you will need to do something like right-click the install_unix +file, then select "properties" (or "permissions" or something similar), and change the +file "mode" or "permissions" to include "execution" by the owner of the file (the user +account you are currently using should be the owner of the file). Once the file is set +as executable, run the file (probably by clicking on it). + diff --git a/README.windows b/README.windows new file mode 100644 index 0000000..4e0ad05 --- /dev/null +++ b/README.windows @@ -0,0 +1,2 @@ +This file contains information about how to install and run ZX on a Windows system. +Consult README.md for general information about ZX as a program and as a project. diff --git a/install.escript b/install.escript new file mode 100755 index 0000000..cc905b3 --- /dev/null +++ b/install.escript @@ -0,0 +1,119 @@ +#! /usr/bin/env escript + +%% ZX install script + +-mode(compile). + +-spec main(Argv :: [string()]) -> no_return(). + +main(_) -> + OS = os:type(), + ZompDir = zomp_dir(OS), + case filelib:is_dir(ZompDir) of + true -> + Message = "Installation directory (~ts) already exists. Aborting.~n", + ok = io:format(Message, [ZompDir]), + halt(0); + false -> + unpack(OS, ZompDir) + end. + + +-spec unpack(OS, ZompDir) -> no_return() + when OS :: {Family :: unix | win32, + Name :: atom()}, + ZompDir :: file:filename(). + +unpack(OS, ZompDir) -> + BaseDir = filename:dirname(ZompDir), + ok = erl_tar:extract("zomp.tar.gz", [compressed, {cwd, BaseDir}]), + add_launcher(OS, ZompDir). + + +-spec add_launcher(OS, ZompDir) -> no_return() + when OS :: {Family :: unix | win32, + Name :: atom()}, + ZompDir :: file:filename(). + +add_launcher({unix, linux}, ZompDir) -> + add_unix_link(ZompDir), + ok = io:format("Should attempt a FreeDesktop icon addition here.~n"), + halt(0); +add_launcher({unix, _}, ZompDir) -> + add_unix_link(ZompDir), + halt(0); +add_launcher({win32, nt}, _ZompDir) -> + ok = io:format("This is going to be a bit of a rodeo...~n"), + halt(0). + + +-spec add_unix_link(ZompDir) -> ok + when ZompDir :: file:filename(). + +add_unix_link(ZompDir) -> + Home = filename:dirname(ZompDir), + Link = filename:join(Home, "bin/zx"), + HomeBin = filename:dirname(Link), + Target = filename:join(ZompDir, "zx.sh"), + ok = filelib:ensure_dir(Link), + LinkCommand = "env LANG=en ln -s " ++ Target ++ " " ++ Link, + ModeCommand = "env LANG=en chmod +x " ++ Target, + ok = os_cmd(LinkCommand), + ok = os_cmd(ModeCommand), + Path = os:getenv("PATH"), + Parts = string:lexemes(Path, ":"), + Message = + case lists:member(HomeBin, Parts) of + true -> + "A link to ~ts has been created at ~ts.~n" + "~ts seems to be in $PATH already.~n" + "You should be able to run any zomp/zx program by typing `zx` " + "from anywhere in your system.~n" + "Creating launchers to the link that start specific programs may be " + "conveinent.~n" + "A desktop launcher would need to run the command:~n" + " zx run [some_program]~n" + "Or alternately (if ~~/bin/ is not in your launcher's $PATH):~n" + " ~ts run [some_program]~n"; + false -> + "A link to ~ts has been created at ~ts. " + "~ts seems to be NOT in your $PATH. " + "You will need to add that to $PATH if you want to be able to run " + "zx by simply typing `zx` from anywhere in your system." + "Creating launchers to the link that start specific programs may be " + "conveinent.~n" + "A desktop launcher would need to run the command:~n" + " ~ts run [some_program]~n" + end, + io:format(Message, [Target, Link, HomeBin, Target]). + + +-spec os_cmd(Command :: string()) -> ok. + +os_cmd(Command) -> + case os:cmd(Command) of + "" -> + ok; + Output -> + ok = io:format("Output of: ~tp~n", [Command]), + io:format("~ts~n", [Output]) + end. + + +-spec zomp_dir(OS) -> file:filename() + when OS :: {Family :: unix | win32, + Name :: atom()}. +%% @private +%% Check the host OS and return the absolute path to the zomp filesystem root. + +zomp_dir({unix, _}) -> + Home = os:getenv("HOME"), + filename:join(Home, "zomp"); +zomp_dir({win32, _}) -> + Drive = os:getenv("HOMEDRIVE"), + Path = os:getenv("HOMEPATH"), + filename:join([Drive, Path, "zomp"]); +zomp_dir(Unknown) -> + Message = "zx_install: ERROR Unknown host system type: ~tp", + ok = io:format(Message, [Unknown]), + halt(1). diff --git a/install_unix b/install_unix new file mode 100755 index 0000000..eb2a16c --- /dev/null +++ b/install_unix @@ -0,0 +1,9 @@ +#! /bin/sh + +if escript_path=$(command -v escript) + then + echo "Using escript found at $escript_path" + escript install.escript + else + echo "Could not locate an Erlang installation." +fi diff --git a/install_windows.cmd b/install_windows.cmd new file mode 100644 index 0000000..90b00d2 --- /dev/null +++ b/install_windows.cmd @@ -0,0 +1,16 @@ +@echo off +setlocal + +set versions=9.2 + +for %%v in (%versions%) do ( + if exist "%ProgramFiles%\erl%%v\bin\escript.exe" ( + "%ProgramFiles%\erl%%v\bin\escript.exe" install.escript + notify "Done!" + exit /b + ) +) + +echo Could not find the Erlang escript.exe executable +notify "Could not locate a expected Erlang runtime. Consult the README.windows file in this directory for more information." +exit /b \ No newline at end of file diff --git a/notify.vbs b/notify.vbs new file mode 100644 index 0000000..99e38b5 --- /dev/null +++ b/notify.vbs @@ -0,0 +1,2 @@ +messageText = WScript.Arguments(0) +MsgBox messageText \ No newline at end of file diff --git a/packup b/packup new file mode 100755 index 0000000..bbe2964 --- /dev/null +++ b/packup @@ -0,0 +1,24 @@ +#! /usr/bin/env escript + + +main([Version]) -> + Tar = "zomp.tar.gz", + ok = erl_tar:create(Tar, ["zomp"], [compressed]), + Zip = "zx-" ++ Version ++ ".zip", + ZipFiles = + ["install.escript", + "install_unix", + "install_windows.cmd", + "notify.vbs", + "README.md", + "README.unix", + "README.windows", + "LICENSE", + 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). diff --git a/zomp/key/otpr/otpr.1.package.pub.der b/zomp/key/otpr/otpr.1.package.pub.der new file mode 100644 index 0000000000000000000000000000000000000000..e844a3bfb704c026ff00c05bee00a3db78380102 GIT binary patch literal 2062 zcmV+p2=VtYf(Qx%f(QWs+4~Y8{hu^D9WI+v*(Kd+X^!qnl?)??wZi+0@JH$Oz(Wl} zmx4lZ0Y8K&cm(U1LMGHmB$^ihD37Jxlp|hZ!*lp>Llr;cl)*NGrgBC$bnj!fj-4gF zW%d9ZSV<6~Ke=CS3Fs*qvX>pO;4+!!p^iPDWax%<9>X7-0mKY+d9d~(t$Y1cLqO66-b1>y8=E+$m;awhr=q)#Nj6T6C)I!SF$RIsmvI8{MT|vo$Ac!4})M*KvtGBOPQ0N+mYf$&#r@KziaCHdMndI%AOo#1QkDst8Hre?w%#AW*31G9-k*pjHIpbdpR zdjbc8d;r{qyqbV6)f~f~N> z6~(@spo)B}cYW*g5*il2-d` zvb9Lo5J%I!kcg0rO9M%y(%Dz3`~{mIIu|YvrXInA*5*>7PFJJpH{Ro%}Z$7dazfY(s<%X+jspz zXMDYdIWFBf%&GjV(YSc}RTOtgYNCA;E4~c?g=>|ag&d;t5QAeJIM^mye$$}?8D4)U z>wJ5Z(G_CWFB>Q0S z^;h4Rc7y79nS)cI+FPi7&)Yz}mYpD84wu~iI3yJ0ERj)jxK9>mG^mFx;Uqa7 z$r*d20JQSRJ(r5idk?~W@pVs=?TXOxZTQuO&V}xe8KET4%TN)l% zsYD~|3x-d5dPg{ZrnvE^(9<3mbCWJC?1NAYJy?RUW}A!-qlT41-s*H$*bZe1l)ab= zE=+qW(XhW+Q^9@fm(3KZhGb%uP_U0>xQP`k^ocG$AtwOUFuSSAUx#U#_5;-H%Kw$d zuM=u{UVGl$mJ|MY#O>HRzT{F{?^J*x`xvXJJ<|wY1KyC8LkpTZ4#F~Bd6E76pwTFg z&z!E&tEx<~_NyS`HX7n<9;qj1@Y2sGwqTws_-#Idb{^{e28qY<48Cp|5jc@I=3yyAIJj4CH(UU zz;X$kuqK2H9z8PLOBwwg^CDZP+`O55WFuKnbP3f5 z9H-b%q&3&CdW?DXBs05f7OP6Iei(_~>leOY+yqmkIdJi$c;0rukwlMST=HE%FK@^D(4fFbBoOuJr>ggG5lv->1dy`#o(h$B?~%7#8?(&zDa+8F&2ksPp2e?9I|y=1JO=yRERjZTA7nFtyL8Ie!ZEf! zwgP@cG-JRMh9;3ADx)RqqgL`>Up%YMti~Q)qdqNNA8(-ST!OlJKBFGFzR|V%klVaa zck(C=wpA#&H4Dfx7xP&C$dcg)1DnNfM7aMgN9kmgFo^r25%xE9!x6`K%oQ;QZA6(S z$t{lF-3Tv)6hI_Rz32BCcy3Ejm4DVir9Ulese!Ez@I4MSBf5wBE@Z>Cv&?=;G+=9Y zCva~%8v#WONS&FEu2-WQK@WS3h^&M0e8q$H1piC##28aBg**T72gOIo^Xofy7f>H# zfQ7{p4tl8HC{_yikXy^dn$X=(BR`dTY{y2nJA(r=VY_^~otvwOCGnLlOb=~m#*?LZ zLOz~s!Y*+WgmZQQLTHW#LMQG)MYd+-Tak9PD+y@SRlFD>#rg|u2uBc7^Eo2R5#;Nk sc&wqfkxHKrMYU40l%%>V!Z literal 0 HcmV?d00001 diff --git a/zomp/key/otpr/otpr.1.realm.pub.der b/zomp/key/otpr/otpr.1.realm.pub.der new file mode 100644 index 0000000000000000000000000000000000000000..a4df4cb9b6fa962bbbd555ad8b528d4ad389aceb GIT binary patch literal 2062 zcmV+p2=VtYf(Qx%f(QWs$#_sbM_lA3`Zv{ZlTrR)r@oRGPvR;Xd zv8HYpK9kr5jo%#yKtBJ21?fZ9l4@-Ngzn(8J-aYGGfr^B+oI!0u8b$Rj$Kl%-sngP zX`DtWk8+Hj4>`+nwX%UPMED$ zc`CccSD7}GyZQ8n;>X98z(!~2%+DmRgHF}@SPNX1@Kh*qQvSx#Tt}UysVD-6*8VOwcV!E2Uib|0{QT5BB!gZ| zArkQ>+`cAd3r&obc`dh)bm6o86p?>xzH#!$?<2!*? zn-uF)T=~#Ka%W3_G^KfJs{ob{W{6lXeNh{-nWKl1MNNPA@+9sC?XT33C2y*ptecc< zC0A4HH^8?MI>Eoo1Q5uEJSCr*Qf1&~;6vBO(GdguF)UUT4hfOrS=uJq``8(ShZ^DT zV|ge)C$RV@97+i}SG`SXUXImt&>^d{#TzkVDQ6Ib`t-YP&K>JT1%$PLZI#5r3$bgT zr8&2v>9*j4s{qz-tn|5yeFIG`Ku{7w{R@1N$RdG5<1i`P?WK*>ovjhkCOLORojxCa zLnCN6Q8)cH{(_*7Xu*^j9_~Pxe!l(RJ_?rzo{+#JJ{R$s^k2{j@-R`38y#(9R57kI zDtcHeg-xXYQzOvs=Zpapah|kM6Z2m&admHDL9ASrVwq$8R=dt7(v zWXZh7s?7K!kY2-8z`B`go=^?BDmvD3*dw*K{0Al~RsZL5vov*rvKI9$Ly{-P)k_lN zl%(znuQ-)&A=w!zAHSKKvJ|4)I9VUlSlRAvP`;DJmw<`C$&XUGD?ZYvIMk`8D1mKrlZh{FU?FJ+^h2BC$r_kOLX-IMH1JK^! z1JYPMy{l+@Y1MIYVA~q4X8t+1)d#j0>n(W0Q~RXIrXcSH!(3%QYki`PqVb<@!nD z-2wJ9vVC{}W-Nxwr~K8&+iguxX|3~s*-_Y-fZIwFQ0@NHZ(?jr0zm!}ocr)kjr!sg zF6xF)CzyL;Ht}or;Zs_lKr6W>Q(u@Yzb~1&1eXhlpy}tw&2A6xL09Agqp*P@D$eS5 ziBKgXz>>tSGu_RC8Sd}F0x;&N7k;XoFR=lQ68Z@UfvMUj_?6bK&wlPFZ~6D8GAV-B z`-XX}1d}K4JN{`YN)Rk$M+Y#@hzIrSxLeRE^xWiQmYjxD=IL|LKQCBk1_m8^2HZlQ^kf+0A$|fo zneIz`^4L-;)5!U6=<;LJYCK{ku@z^7OjnaAuNCJ%Xw64BbBHPu6=%k&CbX5YzcEY5 z_$eg+TS}^t!CmgT1N2K81eE5snO&c=C~R8!!;gUM~MVnXK(UHT95h0Fg@UX;26a1XpcJ z`HTT>6N@KBk|jIMpMdU)vbpN*FjEAO?OV`HWM{uRd?m|(u*zSVRR+|#f~bV`9E-Ry zoiB4Ta|$^oZ$==p=RVkZ6WByPW^%k4Q>zazvAAdEME9ot3O#vfKB-TZvz9lS`SWEF z$T6YuOh3w`WiR;8V0H*uOt>mUl$8tmrWWdhC`v}h4wuf@3KILpm+`Nn5Tbe(jxY`i zsRy}z97^r{8EPwut#^qv8C#OnQ+Cs`kW0_vWo8RE2dGp)R*1qDXTa**IH|1>Mr(lw z0&;dd$=Pjxqqf87fj&i=Nl_jO3^k`x$0~<7$zon3wiK(fakEBPHf&@g zjN&MxO`bQoN<~PoeN4h;5I3+cdB$l!Wgfc%IC3ccL6gXeCuU6C7#^ILO0iZJ*)SPI zR2ev%HK*ID*yQvdZR!s1TIa2nB4C{(1OEVf20L~id~?jIOb(5WX(qJIq&lMuvgqIv z+Hnp!B7_ate+6^kBf)6-YS|H?!Z{i2Ryw=@0@M&y2YmupLu@A6?vx(OMI#*f;IY}0 z*ml;rS_N+YIZ%5-?gIkY9Y>lD5T4c6rLR>3?8)Ly`6hW({#Zp;g5s1hjR$&98Z)+g zn|I4T;Ws5+JFU*f-rPD{T{DQ#P@ulpRl(B*Xl;J08;p`P8`Q+a`Whs}CJ>m_4yWY+ sd5OXfD_Q$6sjdP + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ebin/zx.app b/zomp/lib/otpr-zx/0.1.0/ebin/zx.app similarity index 100% rename from ebin/zx.app rename to zomp/lib/otpr-zx/0.1.0/ebin/zx.app diff --git a/include/zx_logger.hrl b/zomp/lib/otpr-zx/0.1.0/include/zx_logger.hrl similarity index 100% rename from include/zx_logger.hrl rename to zomp/lib/otpr-zx/0.1.0/include/zx_logger.hrl diff --git a/src/zx.erl b/zomp/lib/otpr-zx/0.1.0/src/zx.erl similarity index 99% rename from src/zx.erl rename to zomp/lib/otpr-zx/0.1.0/src/zx.erl index aa83610..8741ca7 100644 --- a/src/zx.erl +++ b/zomp/lib/otpr-zx/0.1.0/src/zx.erl @@ -586,7 +586,7 @@ update_version(Realm, Name, OldVersion, NewVersion, OldMeta) -> -spec list_realms() -> no_return(). %% @private %% List all currently configured realms. The definition of a "configured realm" is a -%% realm for which a .realm file exists in ~/.zomp/. The realms will be printed to +%% realm for which a .realm file exists in ~/zomp/. The realms will be printed to %% stdout and the program will exit. list_realms() -> @@ -3022,7 +3022,7 @@ zomp_dir() -> case os:type() of {unix, _} -> Home = os:getenv("HOME"), - Dir = ".zomp", + Dir = "zomp", filename:join(Home, Dir); {win32, _} -> Drive = os:getenv("HOMEDRIVE"), diff --git a/src/zx_daemon.erl b/zomp/lib/otpr-zx/0.1.0/src/zx_daemon.erl similarity index 100% rename from src/zx_daemon.erl rename to zomp/lib/otpr-zx/0.1.0/src/zx_daemon.erl diff --git a/zmake b/zomp/lib/otpr-zx/0.1.0/zmake similarity index 100% rename from zmake rename to zomp/lib/otpr-zx/0.1.0/zmake diff --git a/zomp/otpr.realm b/zomp/otpr.realm new file mode 100644 index 0000000..081eb55 --- /dev/null +++ b/zomp/otpr.realm @@ -0,0 +1,22 @@ +{realm,"otpr"}. +{revision,0}. +{prime,{"otpr.psychobitch.party",11311}}. +{private,[]}. +{mirrors,[]}. +{sysops,[{{"otpr","zxq9"},["zxq9.1"],"zxq9@zxq9.com","Craig Everett"}]}. +{realm_keys,[{{"otpr","otpr.1.realm"}, + realm, + {realm,"otpr"}, + <<206,129,232,15,23,149,65,167,9,157,25,210,91,113,55,56,14,12, + 153,218,37,83,148,3,89,208,61,43,95,89,51,228,245,78,115,52,15, + 82,23,100,53,189,136,19,104,58,222,216,184,87,75,231,151,18,90, + 243,115,160,244,32,232,71,57,95>>, + {{2018,1,10},{6,36,41}}}]}. +{package_keys,[{{"otpr","otpr.1.package"}, + package, + {realm,"otpr"}, + <<77,10,171,53,73,87,21,251,153,215,83,119,244,217,207,77,44, + 210,177,77,46,86,52,232,16,64,23,109,214,94,207,140,12,145, + 23,130,151,151,37,82,61,240,82,146,142,199,95,114,77,219,148, + 200,140,85,128,77,110,142,179,137,169,188,223,192>>, + {{2018,1,10},{6,36,41}}}]}. diff --git a/zx.bash b/zomp/zx.sh similarity index 86% rename from zx.bash rename to zomp/zx.sh index fb0967f..dc91166 100755 --- a/zx.bash +++ b/zomp/zx.sh @@ -1,8 +1,8 @@ -#! /bin/bash +#! /bin/sh # set -x -ZOMP_DIR="$HOME/.zomp" +ZOMP_DIR="$HOME/zomp" ORIGIN="$(pwd)" VERSION="$(ls $ZOMP_DIR/lib/otpr-zx/ | sort --field-separator=. --reverse | head --lines=1)" ZX_DIR="$ZOMP_DIR/lib/otpr-zx/$VERSION" diff --git a/zx_install.escript b/zx_install.escript deleted file mode 100644 index dbb9b2e..0000000 --- a/zx_install.escript +++ /dev/null @@ -1,42 +0,0 @@ -#! /usr/bin/env escript - -%% ZX install script - --spec main(Argv :: [string()]) -> no_return(). - -main(_) -> - ZompDir = zomp_dir(), - case filelib:is_dir(ZompDir) of - false -> unpack(ZompDir); - true -> halt(0) - end. - - --spec unpack(ZompDir :: file:filename()) -> no_return(). - -unpack(ZompDir) -> - ZompFile = filename:join(ZompDir, "zomp.conf"), - ok = filelib:ensure_dir(ZompFile), - ok = erl_tar:extract("zx.tgz", [compressed, {cwd, ZompFile}]), - halt(0). - - --spec zomp_dir() -> file:filename(). -%% @private -%% Check the host OS and return the absolute path to the zomp filesystem root. - -zomp_dir() -> - case os:type() of - {unix, _} -> - Home = os:getenv("HOME"), - Dir = ".zomp", - filename:join(Home, Dir); - {win32, _} -> - Drive = os:getenv("HOMEDRIVE"), - Path = os:getenv("HOMEPATH"), - Dir = "zomp", - filename:join([Drive, Path, Dir]); - Unknown -> - ok = io:format("zx_install: ERROR Unknown host system type: ~tp", [Unknown]), - halt(1) - end.