From a59ae2231055fec56e4061f019bb8061e125242f Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:27:11 -0900 Subject: [PATCH 01/22] Initial commit, added log library --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 9 + libs/log.sh | 69 ++++++ 3 files changed, 752 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 libs/log.sh diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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: + + Copyright (C) + 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/README.md b/README.md new file mode 100644 index 0000000..7f1bc8a --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# bash-libs + +(C) 2017 Antoine Martin , provided under GNU General Public License v3.0. + +A collection of bash libraries that I tend to use in my scripts + +## log +A systemd-esque cli bash feedback function + diff --git a/libs/log.sh b/libs/log.sh new file mode 100644 index 0000000..091ce43 --- /dev/null +++ b/libs/log.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) + +function log { + if [ ${1} = "INDENT" ]; then + if [ -z "${1}" ]; then + INDENT="0" + else + shift + INDENT=$((${INDENT} ${1} *6 )) + fi + elif [ ${1} = "EXEC" ]; then + shift + echo -en "$(tput cuf "${INDENT}") [ ] ${1}\n" + elif [ ${1} = "OK" ]; then + if [ -z "${2}" ]; then + HEIGHT=1 + else + HEIGHT=$(( ${2} + 1)) + fi + echo -en "$(tput cuu "${HEIGHT}")$(tput cuf "${INDENT}") [$(tput bold)$(tput setaf 2) OK $(tput sgr0)]$(tput cub 100)$(tput cud "${HEIGHT}")" + elif [ ${1} = "WARN" ]; then + shift; + if [ -z "${2}" ]; then + HEIGHT=1 + else + HEIGHT=$(( ${2} + 1)) + fi + echo -en "$(tput cuu "${HEIGHT}")$(tput cuf "${INDENT}") [$(tput bold)$(tput setaf 3) WARN $(tput sgr0)]" + echo -en "\n$(tput cuf "${INDENT}") [>>>>>>] ${1} \n" + if [ -n "${STDERR}" ]; then + cat ${STDERR} + fi + rm ${STDERR} + STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) + echo -en "$(tput cub 100)$(tput cud "${HEIGHT}")" + elif [ ${1} = "FAIL" ]; then + shift; + if [ -z "${2}" ]; then + HEIGHT=1 + else + HEIGHT=$(( ${2} + 1)) + fi + echo -en "$(tput cuu "${HEIGHT}")$(tput cuf "${INDENT}") [$(tput bold)$(tput setaf 1) FAIL $(tput sgr0)]" + echo -en "\n$(tput cuf "${INDENT}") [>>>>>>] ${1} \n" + if [ -n "${STDERR}" ]; then + cat ${STDERR} + fi + rm ${STDERR} + STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) + echo -en "$(tput cuf "${INDENT}") [ ] Fatal error reported. Press any key to shutdown." + read -n 1 -s + echo -en "$(tput cub 100)$(tput cuf "${INDENT}") [" + TIME=3 + while [ ${TIME} -ne 0 ]; do + sleep 1; + echo -en "||" + TIME=$(( ${TIME}-1 )) + done + echo -en "\n$(tput cub 100)$(tput cud "${HEIGHT}")" + exit + elif [ ${1} = "ECHO" ]; then + shift + echo -e "$(tput cuf "${INDENT}") [======] ${1}" + fi + + } +# vim: filetype=bash From f4578ac71b946a1a0bf3071de84893048374c38b Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:31:44 -0900 Subject: [PATCH 02/22] Fixed Markdown syntax errors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f1bc8a..35f8641 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # bash-libs -(C) 2017 Antoine Martin , provided under GNU General Public License v3.0. +$copy; 2017 Antoine Martin \, provided under GNU General Public License v3.0. A collection of bash libraries that I tend to use in my scripts From af445c606ed258e7f370ca8ff0f726b61103a12d Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:32:32 -0900 Subject: [PATCH 03/22] Fixed *another* Markdown syntax error --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 35f8641..098de9a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # bash-libs -$copy; 2017 Antoine Martin \, provided under GNU General Public License v3.0. +© 2017 Antoine Martin \, provided under GNU General Public License v3.0. A collection of bash libraries that I tend to use in my scripts From deddc156358774a43e9aad3ff194b44004bee9d8 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:39:27 -0900 Subject: [PATCH 04/22] Initial commit --- PKGBUILD | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..b039f00 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,28 @@ +pkgname=bash-libs +pkgver=0.1 +pkgrel=1 +pkgdesc="A collection of bash libraries that I tend to use in my scripts" +arch=(any) +changelog=CHANGELOG +license=('GPL3') +depends=() +source=( + "${pkgname}::git+ssh://git@github.com/ayakael/${pkgname}/#branch=master" +) + +sha256sums=( + "SKIP" +) + +prepare(){ + cd ${srcdir}/${pkgname} + git checkout ${pkgver} +} + +package() { + + # Install the scripts + for libs in $(find ${srcdir}/libs/. -type f); do + install -Dm644 "${srcdir}/libs/${libs}" "${pkgdir}/usr/lib/bash-libs/$(echo ${libs} | sed 's|.sh||')" + done +} From 79df96441f66a5e6adcc758473f332aa69a5492d Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:43:26 -0900 Subject: [PATCH 05/22] Added CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..ad59473 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +### v0.1 +* Added log library From e6d62628573bc63e153f8a68b6361bf62d143150 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:44:35 -0900 Subject: [PATCH 06/22] Added CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..ad59473 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +### v0.1 +* Added log library From 6c6b979936387ec51b83c6b7f70f1c43540bfbdf Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 20:50:48 -0900 Subject: [PATCH 07/22] Fixed errors in PKGBUILD --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index b039f00..7c1a280 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,11 +3,11 @@ pkgver=0.1 pkgrel=1 pkgdesc="A collection of bash libraries that I tend to use in my scripts" arch=(any) -changelog=CHANGELOG +changelog=CHANGELOG.md license=('GPL3') depends=() source=( - "${pkgname}::git+ssh://git@github.com/ayakael/${pkgname}/#branch=master" + "${pkgname}::git+ssh://git@github.com/ayakael/${pkgname}.git#branch=master" ) sha256sums=( @@ -22,7 +22,7 @@ prepare(){ package() { # Install the scripts - for libs in $(find ${srcdir}/libs/. -type f); do - install -Dm644 "${srcdir}/libs/${libs}" "${pkgdir}/usr/lib/bash-libs/$(echo ${libs} | sed 's|.sh||')" + for libs in $(find ${srcdir}/bash-libs/libs/. -type f -printf %f); do + install -Dm644 "${srcdir}/bash-libs/libs/${libs}" "${pkgdir}/usr/lib/bash-libs/$(echo ${libs} | sed 's|.sh||')" done } From ba9c68eb70557760f1a5f3405b94b15fa7d5a5ce Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 4 Jan 2018 21:07:05 -0900 Subject: [PATCH 08/22] Github source now clones through public https rather than private ssh --- PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7c1a280..9b04981 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,10 +4,11 @@ pkgrel=1 pkgdesc="A collection of bash libraries that I tend to use in my scripts" arch=(any) changelog=CHANGELOG.md -license=('GPL3') +license=('GPLv3') depends=() +makedepends=('git') source=( - "${pkgname}::git+ssh://git@github.com/ayakael/${pkgname}.git#branch=master" + "${pkgname}::git+https://github.com/ayakael/${pkgname}.git" ) sha256sums=( From 79bfb447ea33a1dd408e66e32e6654e5932a5716 Mon Sep 17 00:00:00 2001 From: ayakael Date: Fri, 5 Jan 2018 21:02:41 -0900 Subject: [PATCH 09/22] Functionalized color mangement --- lib/color.sh | 106 ++++++++++++++++++++++++++++++++++++++ libs/log.sh => lib/msg.sh | 2 +- test/test-color.sh | 13 +++++ 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 lib/color.sh rename libs/log.sh => lib/msg.sh (99%) create mode 100644 test/test-color.sh diff --git a/lib/color.sh b/lib/color.sh new file mode 100644 index 0000000..c81bd8e --- /dev/null +++ b/lib/color.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +# doc color { +# +# NAME +# color +# +# DESCRIPTION +# Sets color variables for easy color change +# +# USAGE +# _color [] +# +# COMMAND +# fg +# Sets foreground to defined color +# +# bfg +# Set foreground to bold and defined color +# +# bg +# Sets background to defined color +# +# rs +# Resets text to terminal default +# +# COLOR +# blk +# Color black +# +# red +# Color red +# +# grn +# Color green +# +# yel +# Color yellow +# +# blu +# Color blue +# +# mag +# Color magenta +# +# cyn +# Color cyan +# +# gry +# Color grey +# } + +cmdoptArray=(fg bfg bg rs) +coloptArray=(blk red grn yel blu mag cyn gry) + +_color_to_ansi() { + COL=${1} + for no in {0..7}; do + if [ "${COL}" == "${coloptArray[${no}]}" ]; then + echo $(( ${no} + 30 )) + fi + done +} +_color() { + CMD=${1} + COL=${2} + + # Sanity check for COMMAND argument + for cmdopt in ${cmdoptArray[@]}; do + if [ "${cmdopt}" == "${CMD}" ]; then + CMD_EXIST=true + fi + done + if ! ${CMD_EXIST}; then + _msg ECHO "_color(): ${CMD} not a command" + fi + + # Sanity check for COLOR argument + for colopt in ${coloptArray[@]}; do + if [ "${colopt}" == "${COL}" ]; then + OPT_EXIT=true + fi + done + if ! ${OPT_EXIT}; then + _msg ECHO "_color(): ${COL} not a color" + fi + + # Converts color to associated ANSI value + ANSI="$(_color_to_ansi ${COL})" + + case ${CMD} in + bfg) + BOLD="1;" + ;; + + bg) + ANSI=$(( ${ANSI} + 10 )) + ;; + + rs) + ANSI=0 + ;; + esac + + echo -e "\033[${BOLD}${ANSI}m" +} diff --git a/libs/log.sh b/lib/msg.sh similarity index 99% rename from libs/log.sh rename to lib/msg.sh index 091ce43..11b3c3d 100644 --- a/libs/log.sh +++ b/lib/msg.sh @@ -2,7 +2,7 @@ STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) -function log { +_msg(){ if [ ${1} = "INDENT" ]; then if [ -z "${1}" ]; then INDENT="0" diff --git a/test/test-color.sh b/test/test-color.sh new file mode 100644 index 0000000..e5d6ffd --- /dev/null +++ b/test/test-color.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +source ../lib/msg.sh +source ../lib/color.sh + +_msg ECHO "Begin color.sh test" +for cmd in fg bfg bg; do + for col in ${coloptArray[@]}; do + echo "Testing _color $(_color ${cmd} ${col})${cmd} ${col}$(_color rs)" + done +done +_msg ECHO "End color.sh test" + From 5f446594eecb1b8e20e95590d75e4bcb00f2948e Mon Sep 17 00:00:00 2001 From: ayakael Date: Sat, 6 Jan 2018 00:26:35 -0900 Subject: [PATCH 10/22] Fixed faulty sanity check in _color() --- lib/color.sh | 48 ++++++++++++++++++++++------------------------ test/test-color.sh | 3 ++- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/color.sh b/lib/color.sh index c81bd8e..e716a12 100644 --- a/lib/color.sh +++ b/lib/color.sh @@ -9,22 +9,22 @@ # Sets color variables for easy color change # # USAGE -# _color [] +# _color [] # # COMMAND -# fg +# fg # Sets foreground to defined color # -# bfg +# bfg # Set foreground to bold and defined color # -# bg +# bg # Sets background to defined color # # rs # Resets text to terminal default # -# COLOR +# COLORS # blk # Color black # @@ -48,57 +48,55 @@ # # gry # Color grey +# # } + cmdoptArray=(fg bfg bg rs) coloptArray=(blk red grn yel blu mag cyn gry) _color_to_ansi() { - COL=${1} + local COL=${1} for no in {0..7}; do if [ "${COL}" == "${coloptArray[${no}]}" ]; then echo $(( ${no} + 30 )) fi done } -_color() { - CMD=${1} - COL=${2} +_color() { + local CMD=${1} + local COL=${2} # Sanity check for COMMAND argument - for cmdopt in ${cmdoptArray[@]}; do - if [ "${cmdopt}" == "${CMD}" ]; then - CMD_EXIST=true - fi - done - if ! ${CMD_EXIST}; then + if [ -z ${1+x} ]; then + _msg ECHO "_color(): Command not defined" + elif ! _if_array_contains "${CMD}" "${cmdoptArray[@]}"; then _msg ECHO "_color(): ${CMD} not a command" fi # Sanity check for COLOR argument - for colopt in ${coloptArray[@]}; do - if [ "${colopt}" == "${COL}" ]; then - OPT_EXIT=true + [ ! "${CMD}" == "rs" ] && { + if [ -z ${2+x} ]; then + _msg ECHO "_color(): Color not defined" + elif ! _if_array_contains "${COL}" "${coloptArray[@]}"; then + _msg ECHO "_color(): ${COL} not a color" fi - done - if ! ${OPT_EXIT}; then - _msg ECHO "_color(): ${COL} not a color" - fi + } # Converts color to associated ANSI value ANSI="$(_color_to_ansi ${COL})" case ${CMD} in bfg) - BOLD="1;" + local BOLD="1;" ;; bg) - ANSI=$(( ${ANSI} + 10 )) + local ANSI=$(( ${ANSI} + 10 )) ;; rs) - ANSI=0 + local ANSI=0 ;; esac diff --git a/test/test-color.sh b/test/test-color.sh index e5d6ffd..46e9c03 100644 --- a/test/test-color.sh +++ b/test/test-color.sh @@ -2,10 +2,11 @@ source ../lib/msg.sh source ../lib/color.sh +source ../lib/if.sh _msg ECHO "Begin color.sh test" for cmd in fg bfg bg; do - for col in ${coloptArray[@]}; do + for col in blk red grn yel blu mag cyn gry; do echo "Testing _color $(_color ${cmd} ${col})${cmd} ${col}$(_color rs)" done done From fca165b274805d58962c3e5b26afb9b13efcbbf6 Mon Sep 17 00:00:00 2001 From: ayakael Date: Sat, 6 Jan 2018 20:30:09 -0900 Subject: [PATCH 11/22] * Changed name for _log function to _msg, added bail() function. * Created _ansi function library to set terminal properties like cursor position and text color. * Created _if function library, a set of simple if statements. Added _if_array_contains, _if_is_integer, _if_is defined, if_has_value --- README.md | 18 ++++- lib/ansi.sh | 188 +++++++++++++++++++++++++++++++++++++++++++++ lib/color.sh | 104 ------------------------- lib/if.sh | 57 ++++++++++++++ lib/msg.sh | 73 +++++++++++++----- test/test-ansi.sh | 109 ++++++++++++++++++++++++++ test/test-color.sh | 14 ---- test/test-if.sh | 26 +++++++ test/test-msg.sh | 28 +++++++ 9 files changed, 476 insertions(+), 141 deletions(-) create mode 100644 lib/ansi.sh delete mode 100644 lib/color.sh create mode 100644 lib/if.sh create mode 100644 test/test-ansi.sh delete mode 100644 test/test-color.sh create mode 100644 test/test-if.sh create mode 100644 test/test-msg.sh diff --git a/README.md b/README.md index 098de9a..8486e18 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,19 @@ -# bash-libs +# bunc © 2017 Antoine Martin \, provided under GNU General Public License v3.0. -A collection of bash libraries that I tend to use in my scripts +A set of bash functions -## log -A systemd-esque cli bash feedback function +## _msg +Messaging framework for scripts. +## _if functions +Set of if functions to make life easier +* _if_array_contains True if variable exists in array as element +* _if_is_integer True is variable is integer. Can be multiple +* _if_is_defined True if variable is defined (Not working) +* _if_has_value True if variable has non-zero value (Not working) + +## _ansi +Sets terminal properties such as cursor position and text color using ANSI +escape sequences. diff --git a/lib/ansi.sh b/lib/ansi.sh new file mode 100644 index 0000000..e01608e --- /dev/null +++ b/lib/ansi.sh @@ -0,0 +1,188 @@ +#!/bin/bash + +# doc ansi { +# +# NAME +# ansi +# +# DESCRIPTION +# Sets terminal properties such as cursor position and text color. +# +# USAGE +# _ansi [] +# +# COMMAND +# lt +# Moves cursor left +# +# dn +# Moves cursor down +# +# up +# Moves cursor up +# +# rt +# Moves cursor right +# +# mc ; +# Moves cursor to and +# +# sc +# Saves cursor position +# +# rc +# Restores cursor position +# +# cl +# Clears the line +# +# cs +# Clears the screen +# +# fg +# Sets foreground to defined color +# +# bf +# Sets foreground to bold and defined color +# +# bg +# Sets background to defined color +# +# rs +# Resets text to terminal default +# +# COLORS +# blk +# Color black +# +# red +# Color red +# +# grn +# Color green +# +# yel +# Color yellow +# +# blu +# Color blue +# +# mag +# Color magenta +# +# cyn +# Color cyan +# +# gry +# Color grey +# +# } + + +_cmd_to_ansi() { + local CMD="${1}"; shift + local cmdoptArray=("${@}") + local ansiArray=(A B C D H s u K 2J m) + + for no in {0..12}; do + if [ "${CMD}" == "${cmdoptArray[${no}]}" ]; then + [[ ${no} -ge 9 ]] && local no=9 + echo ${ansiArray[${no}]} + fi + done +} + + +_color_to_ansi() { + local COL=${1}; shift + local coloptArray=(${@}) + + for no in {0..7}; do + if [ "${COL}" == "${coloptArray[${no}]}" ]; then + echo $(( ${no} + 30 )) + fi + done +} + +_arg_to_ansi() { + local CMD=${1}; shift + local ARG=${1}; shift + local coloptArray=(${@}) + + if [ "${CMD}" == "bf" ]; then + echo "1;$(_color_to_ansi ${ARG} ${coloptArray[@]})" + elif [ "${CMD}" == "fg" ]; then + echo "$(_color_to_ansi ${ARG} ${coloptArray[@]})" + elif [ "${CMD}" == "bg" ]; then + echo "$(( $(_color_to_ansi ${ARG} ${coloptArray[@]}) + 10 ))" + elif [ "${CMD}" == "rs" ]; then + echo "0" + else + echo "${ARG}" + fi +} + +_ansi() { + local CMD=${1} + local ARG=${2} + + # Possible input arrays + # All commands + + local cmdoptArray=(up dn rt lt mc sc rc cl cs fg bf bg rs) + # No argument commands + local cmdopt_noargArray=(sc rc cl cs rs) + # One argument commands + local cmdopt_intArray=(lt dn up rtc) + # Coord only array + local cmdopt_coordArray=(mc) + # Color only commands + local cmdopt_colorArray=(fg bf bg) + # All colors + local coloptArray=(blk red grn yel blu mag cyn gry) + + + # cmd content sanity + if [ -z ${CMD+x} ]; then + _msg ECHO "_ansi(): Command not defined" + elif ! _if_array_contains ${CMD} ${cmdoptArray[@]}; then + _msg ECHO "_ansi(): ${CMD} not a command" + fi + + # arg quantity sanity + # no arg commands + if _if_array_contains ${CMD} ${cmdopt_noargArray[@]}; then + if [ -z ${ARG+x} ]; then + _msg ECHO "_ansi(): ${CMD} expected no arguments" + return 1 + fi + # 1 arg commands + elif _if_array_contains ${CMD} ${cmdopt_1argArray[@]}; then + if [ -z ${ARG+x} ]; then + _msg ECHO "_ansi(): ${CMD} expected 1 argument" + return 1 + fi + + # arg content sanity + # integer commands + elif _if_array_contains ${CMD} ${cmdopt_intArray[@]}; then + if ! _if_is_integer ${ARG}; then + _msg ECHO "_ansi(): ${CMD} expected integer as argument" + return 1 + fi + # coord commands + elif _if_array_contains ${CMD} ${cmdopt_coordArray[@]}; then + if ! _if_integer $(echo ${ARG} | sed 's|;| |'); then + _msg ECHO "_ansi(): ${CMD} expected integers as argument" + fi + # color commands + elif _if_array_contains ${CMD} ${cmdopt_colorArray[@]}; then + if ! _if_array_contains ${ARG} ${coloptArray[@]}; then + _msg ECHO "_ansi(): ${CMD} expected argument to match ${coloptArray[@]}" + return 1 + fi + fi + + echo -e "\033[$(_arg_to_ansi ${CMD} ${ARG} ${coloptArray[@]})$(_cmd_to_ansi ${CMD} ${cmdoptArray[@]})" + +} diff --git a/lib/color.sh b/lib/color.sh deleted file mode 100644 index e716a12..0000000 --- a/lib/color.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -# doc color { -# -# NAME -# color -# -# DESCRIPTION -# Sets color variables for easy color change -# -# USAGE -# _color [] -# -# COMMAND -# fg -# Sets foreground to defined color -# -# bfg -# Set foreground to bold and defined color -# -# bg -# Sets background to defined color -# -# rs -# Resets text to terminal default -# -# COLORS -# blk -# Color black -# -# red -# Color red -# -# grn -# Color green -# -# yel -# Color yellow -# -# blu -# Color blue -# -# mag -# Color magenta -# -# cyn -# Color cyan -# -# gry -# Color grey -# -# } - - -cmdoptArray=(fg bfg bg rs) -coloptArray=(blk red grn yel blu mag cyn gry) - -_color_to_ansi() { - local COL=${1} - for no in {0..7}; do - if [ "${COL}" == "${coloptArray[${no}]}" ]; then - echo $(( ${no} + 30 )) - fi - done -} - -_color() { - local CMD=${1} - local COL=${2} - # Sanity check for COMMAND argument - if [ -z ${1+x} ]; then - _msg ECHO "_color(): Command not defined" - elif ! _if_array_contains "${CMD}" "${cmdoptArray[@]}"; then - _msg ECHO "_color(): ${CMD} not a command" - fi - - # Sanity check for COLOR argument - [ ! "${CMD}" == "rs" ] && { - if [ -z ${2+x} ]; then - _msg ECHO "_color(): Color not defined" - elif ! _if_array_contains "${COL}" "${coloptArray[@]}"; then - _msg ECHO "_color(): ${COL} not a color" - fi - } - - # Converts color to associated ANSI value - ANSI="$(_color_to_ansi ${COL})" - - case ${CMD} in - bfg) - local BOLD="1;" - ;; - - bg) - local ANSI=$(( ${ANSI} + 10 )) - ;; - - rs) - local ANSI=0 - ;; - esac - - echo -e "\033[${BOLD}${ANSI}m" -} diff --git a/lib/if.sh b/lib/if.sh new file mode 100644 index 0000000..ab3d9f5 --- /dev/null +++ b/lib/if.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +# doc if { +# +# NAME +# if +# +# DESCRIPTION +# A collection of special if functions +# +# USAGE +# +# +# FUNCTIONS +# _array_contains " "" +# Checks if variable exists in array +# +# _is_integer +# Checks if variable is integer +# EXIT VALUES +# 0 Check succesful +# 1 Check failed +# +# } + +_if_array_contains() { + local i=${1}; shift + local eArray=(${@}) + + for e in ${eArray[@]}; do + [[ "${e}" = "${i}" ]] && return 0 + done + return 1 +} + +_if_is_integer () { + local iArray=(${@}) + for i in ${iArray[@]}; do [[ ${i} =~ ^-?[0-9]+$ ]] && return 0; done + return 1 +} + +_if_is_defined () { + [[ ! ${!1} && ${!1-_} ]] && { + echo "$1 is not set, aborting." >&2 + exit 1 + } +} + +_if_has_value () { + if is_defined $1; then + if [[ -n ${!1} ]]; then + return 0 + fi + fi + return 1 +} + diff --git a/lib/msg.sh b/lib/msg.sh index 11b3c3d..5a4fd79 100644 --- a/lib/msg.sh +++ b/lib/msg.sh @@ -1,6 +1,50 @@ #!/bin/bash +# doc msg { +# +# NAME +# msg +# +# DESCRIPTION +# Messaging framework for scripts +# +# USAGE +# _msg +# +# COMMAND +# INDENT +/- +# Indents string. +# +# EXEC +# Prints EXEC line with message +# +# OK +# Updates the status of an EXEC message to OK. Set when the EXEC +# status is higher than directly above the current line. +# +# WARN +# Updates the status of an EXEC message to WARN, a non-fatal error. If the +# output to the warning command redirects to ${STDERR}. it will be +# outputted. Set when the EXEC line is higher than directly +# above the current line. +# +# FAIL +# Updates the status to an EXEC message to FAIL, a fatal error. If the +# output to the failed command redirects to ${STDERR}, it will be +# outputted. The bail() function will then be executed, which defaults to +# returning with an exit code 1, than exits. Set when the EXEC line +# is higher than directly above the current line. +# +# ECHO +# Prints a normal message +# } + STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) +INDENT=0 +bail() { + return 1 + exit +} _msg(){ if [ ${1} = "INDENT" ]; then @@ -12,14 +56,14 @@ _msg(){ fi elif [ ${1} = "EXEC" ]; then shift - echo -en "$(tput cuf "${INDENT}") [ ] ${1}\n" + echo -en "$(_ansi rt "${INDENT}") [ ] ${1}\n" elif [ ${1} = "OK" ]; then if [ -z "${2}" ]; then HEIGHT=1 else HEIGHT=$(( ${2} + 1)) fi - echo -en "$(tput cuu "${HEIGHT}")$(tput cuf "${INDENT}") [$(tput bold)$(tput setaf 2) OK $(tput sgr0)]$(tput cub 100)$(tput cud "${HEIGHT}")" + echo -en "$(_ansi up "${HEIGHT}")$(_ansi rt "${INDENT}") [$(_ansi bf grn) OK $(_ansi rs)]$(_ansi lt 100)$(_ansi dn "${HEIGHT}")" elif [ ${1} = "WARN" ]; then shift; if [ -z "${2}" ]; then @@ -27,14 +71,14 @@ _msg(){ else HEIGHT=$(( ${2} + 1)) fi - echo -en "$(tput cuu "${HEIGHT}")$(tput cuf "${INDENT}") [$(tput bold)$(tput setaf 3) WARN $(tput sgr0)]" - echo -en "\n$(tput cuf "${INDENT}") [>>>>>>] ${1} \n" + echo -en "$(_ansi up "${HEIGHT}")$(_ansi rt "${INDENT}") [$(_ansi bf yel) WARN $(_ansi rs)]" + echo -en "\n$(_ansi rt "${INDENT}") [>>>>>>] ${1} \n" if [ -n "${STDERR}" ]; then cat ${STDERR} fi rm ${STDERR} STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) - echo -en "$(tput cub 100)$(tput cud "${HEIGHT}")" + echo -en "$(_ansi lt 100)$(_ansi dn "${HEIGHT}")" elif [ ${1} = "FAIL" ]; then shift; if [ -z "${2}" ]; then @@ -42,27 +86,18 @@ _msg(){ else HEIGHT=$(( ${2} + 1)) fi - echo -en "$(tput cuu "${HEIGHT}")$(tput cuf "${INDENT}") [$(tput bold)$(tput setaf 1) FAIL $(tput sgr0)]" - echo -en "\n$(tput cuf "${INDENT}") [>>>>>>] ${1} \n" + echo -en "$(_ansi up "${HEIGHT}")$(_ansi rt "${INDENT}") [$(_ansi bf red) FAIL $(_ansi rs)]" + echo -en "\n$(_ansi rt "${INDENT}") [>>>>>>] ${1} \n" if [ -n "${STDERR}" ]; then cat ${STDERR} fi rm ${STDERR} STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) - echo -en "$(tput cuf "${INDENT}") [ ] Fatal error reported. Press any key to shutdown." - read -n 1 -s - echo -en "$(tput cub 100)$(tput cuf "${INDENT}") [" - TIME=3 - while [ ${TIME} -ne 0 ]; do - sleep 1; - echo -en "||" - TIME=$(( ${TIME}-1 )) - done - echo -en "\n$(tput cub 100)$(tput cud "${HEIGHT}")" - exit + echo -en "$(_ansi lt 100)$(_ansi dn "${HEIGHT}")" + bail elif [ ${1} = "ECHO" ]; then shift - echo -e "$(tput cuf "${INDENT}") [======] ${1}" + echo -e "$(_ansi rt "${INDENT}") [======] ${1}" fi } diff --git a/test/test-ansi.sh b/test/test-ansi.sh new file mode 100644 index 0000000..2c0b857 --- /dev/null +++ b/test/test-ansi.sh @@ -0,0 +1,109 @@ +#!/bin/bash +clean() { + exit +} + +source ../lib/msg.sh +source ../lib/ansi.sh +source ../lib/if.sh + +# Possible input arrays +# All commands +cmdArray=(lt dn up rt mc sc rc cl cs fg bf bg rs) +# No argument commands +cmdopt_noargArray=(sc rc cl cs rs) +# One argument commands +cmdopt_intArray=(lt dn up rtc) +# Coord only array +cmdopt_coordArray=(mc) +# Color only commands +cmdopt_colorArray=(fg bf bg) +# All colors +coloptArray=(blk red grn yel blu mag cyn gry) + +_test_cmd_to_ansi() { + _msg EXEC "Testing _cmd_to_ansi function" + cmdArray=(lt dn up rt mc sc rc cl cs fg bf bg rs) + resultArray=(A B C D H s u K 2J m m m m) + for no in {0..12}; do + if ! [ "$(_cmd_to_ansi ${cmdArray[${no}]} ${cmdArray[@]})" == "${resultArray[${no}]}" ]; then + _cmd_to_ansi ${cmdArray[${no}]} ${cmdArray[@]} > ${STDERR} + _msg FAIL + fi + done + _msg OK +} + +_test_color_to_ansi() { + _msg EXEC "Testing _color_to_ansi function" + cmdArray=(blk red grn yel blu mag cyn gry) + resultArray=(30 31 32 33 34 35 36 37) + for no in {0..7}; do + if ! [ "$(_color_to_ansi ${cmdArray[${no}]} ${cmdArray[@]})" == "${resultArray[${no}]}" ]; then + _color_to_ansi ${cmdArray[${no}]} ${cmdArray[@]} > ${STDERR} + _msg FAIL + fi + done + _msg OK +} + +_test_arg_to_ansi() { + _msg EXEC "Testing _arg_to_ansi" + cmdArray=(fg bf bg up mc rs) + argArray=(red red red 2 '4:2' ' ') + coloptArray=(blk red grn yel blu mag cyn gry) + resultArray=(31 '1;31' 41 2 '4:2' '0') + for no in {0..5}; do + if ! [ "$(_arg_to_ansi ${cmdArray[${no}]} ${argArray[${no}]} ${coloptArray[@]})" == "${resultArray[${no}]}" ]; then + _arg_to_ansi ${cmdArray[${no}]} ${argArray[${no}]} ${coloptArray[@]} > ${STDERR} + _msg FAIL + fi + done + _msg OK +} + +_test_ansi_color() { + cmdArray=(fg bf bg) + coloptArray=(blk red grn yel blu mag cyn gry) + resultArray=('\033[30m' '\033[31m' '\033[32m' '\033[1;33m' '\033[1;34m' '\033[1;35m') + for cmd in ${cmdArray[@]}; do + for col in ${coloptArray[@]}; do + echo "Testing _color $(_ansi ${cmd} ${col})${cmd} ${col}" + done + done +} + +_msg ECHO "Begin ansi.sh test" +_test_cmd_to_ansi +_test_color_to_ansi +_test_arg_to_ansi +_test_ansi_color +#_msg ECHO "Testing relative cursor commands" +#_msg INDENT +1 +#for cmd in lt dn up rt; do +# _msg ECHO "Testing ${cmd}" +# _msg EXEC "Testing sanity check for ${CMD} set at 0 units" +# if $(_ansi ${cmd} 0 >${STDERR} 2>&1); then +# _msg OK +# else +# _msg FAIL +# fi + +# _msg EXEC "Testing sanity check for ${CMD} set at no args" +# if ! $(_ansi ${cmd} >${STDERR} 2>&1) ;then +# _msg OK +# else +# _msg FAIL +# fi +# +# _msg EXEC "Testing cursor change for ${CMD} set at 5 units" +# _ansi ${cmd} 5 +#done + +#for cmd in fg bfg bg; do +# for col in blk red grn yel blu mag cyn gry; do +# echo "Testing _color $(_ansi ${cmd} ${col})${cmd} ${col}$(_ansi rs)" +# done +#done +_msg ECHO "End color.sh test" + diff --git a/test/test-color.sh b/test/test-color.sh deleted file mode 100644 index 46e9c03..0000000 --- a/test/test-color.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -source ../lib/msg.sh -source ../lib/color.sh -source ../lib/if.sh - -_msg ECHO "Begin color.sh test" -for cmd in fg bfg bg; do - for col in blk red grn yel blu mag cyn gry; do - echo "Testing _color $(_color ${cmd} ${col})${cmd} ${col}$(_color rs)" - done -done -_msg ECHO "End color.sh test" - diff --git a/test/test-if.sh b/test/test-if.sh new file mode 100644 index 0000000..177c354 --- /dev/null +++ b/test/test-if.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +source "../lib/if.sh" + +echo "_if_array_contains test started" +for result in 2 2 0 1; do + echo "Exit code should be ${result}" + eArray=(aa ab 0 dsa 2) + i=${result} + _if_array_contains "${i}" "${eArray[@]}" + echo $? +done +echo "_if_array_contains test ended" + +echo "_if_is_integer test started" +for result in 0 1; do + echo "Exit code should be ${result}" + if [ ${result} == 0 ]; then + i=0 + else + i=a + fi + _if_is_integer ${i} + echo $? +done +echo "_if_is_integer test ended" diff --git a/test/test-msg.sh b/test/test-msg.sh new file mode 100644 index 0000000..80e556d --- /dev/null +++ b/test/test-msg.sh @@ -0,0 +1,28 @@ +#!/bin/bash +source ../lib/if.sh +source ../lib/ansi.sh +source ../lib/msg.sh + +clean() { +return 0 +} + +echo "Starting test for log library" +_msg ECHO "Testing echo" +sleep 1 +_msg EXEC "Testing EXEC w/ OK" +sleep 1 +_msg OK +sleep 1 +_msg EXEC "Testing EXEC w/ WARN" +sleep 1 +_msg WARN "This is a WARN" +sleep 1 +_msg EXEC "Testing EXEC w/ FAIL" +sleep 1 +_msg FAIL "This is a FAIL" +sleep 1 +_msg INDENT +1 +_msg EXEC "This is EXEC w/ indent of 1" +sleep 1 +_msg OK From fd693e0830338b6014b8f5a5021cbe531fbbf3bc Mon Sep 17 00:00:00 2001 From: ayakael Date: Sat, 6 Jan 2018 20:40:21 -0900 Subject: [PATCH 12/22] Removed CHANGELOG as no release as been done --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index ad59473..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,2 +0,0 @@ -### v0.1 -* Added log library From 8e5a75dd47aaeeab4030955ecbb46ff13a3996fc Mon Sep 17 00:00:00 2001 From: ayakael Date: Tue, 9 Jan 2018 00:10:57 -0900 Subject: [PATCH 13/22] Added first draft, pre-testing version of the config function, which aims to make querying and configuring scripts in bash not a pain in the ass. --- lib/config.sh | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 lib/config.sh diff --git a/lib/config.sh b/lib/config.sh new file mode 100644 index 0000000..9742141 --- /dev/null +++ b/lib/config.sh @@ -0,0 +1,169 @@ +#/bin/bash + +# doc cfg { +# +# NAME +# cfg +# +# DESCRIPTION +# Reads and writes config files delimited by tabs, like fstab, using awk. +# +# USAGE +# _cfg +# +# COMMANDS +# set-file +# Sets path to file +# +# create +# Creates config file and assigns . +# +# print +# Prints value from and . +# +# change +# Assigns new to and . +# +# drop or . +# +# insert <...> +# Inserts new row with a value per column. Number of arguments must match number of columns. +# +# query +# Queries which fits the . +# +# +# CONDITIONALS +# +# +# +# EXIT VALUES +# 0 Success +# 1 Syntax or usage error +# 2 File not found +# 3 File already present +# 4 Row or column not found +# 5 Row or column already has value +# +# } + +_cfg() { + # Sanity check and command parser + [[ ! -z ${1+x} ]] && {_msg ECHO "_cfg(): Expected command"; return 1} + local cmdList="(set-file create print change drop insert query)" + local CMD=${1}; shift + [[ ! _if_array_contains ${CMD} ${cmdList[@]} ]] && {_msg ECHO "_cfg(): Command specified not valid; return 1"} + + # Dispatcher + _cfg_$(sed 's|-|_|' <<<"${CMD}") ${@} +} + +_cfg_column_to_nf() { + # Argument parser and sanity check + [[ ! -z ${1+x} ]] && {_msg ECHO "_cfg(): Expected column name"; return 1} + local COLUMN=${1} + + # Queries list of columns + local columnList=(all $(awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR = 0) {print '${0}'}}' ${_CFG_PATH})) + + # Checks if queried ${COLUMN} exists + if [ if ! _if_array_contains ${COLUMN} ${columnList[@]} ]; then + _msg ECHO "_cfg_column_to_nf(): Column does not exist" + return 1 + else + # Finds what NF is associated with ${COLUMN} + local COUNT=0 + for column ${columnList[@]}; do + [[ "${COLUMN}" == "${column}" ]] && echo "${COUNT}" + local COUNT=$(( ${COUNT} + 1 )) + return 0 + done + fi +} + +_cfg_set_file() { + # Argument parser and sanity check + [[ $# != 1 ]] && {_msg ECHO "_cfg_set_file(): Expected 1 argument"; return 1} + + # Sets _CFG_PATH globally + _CFG_PATH="${1}" + _CFG_TMP_PATH="$(sed 's|\(.*\)\/|\1/.|' <<<"${CFG_PATH}")" +} + +_cfg_create() { + # Argument parser and sanity check + [[ ! -z ${1+x} ]] && {_msg ECHO "_cfg_create(): Expected argument"; return 1} + local colList=(${@}) + + # Creates config file + printf "%s\t" ${colList[@]} >> ${_CFG_PATH} +} + +_cfg_print() { + # Argument parser and sanity check + [[ $# != 2 ]] && {_msg ECHO "_cfg_print(): Expected 2 arguments"; return 1} + local COLUMN=${1} + local ROW=${2} + + # Prints row of ${_CFG_PATH} + awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR='${ROW}') {print $'$(_cfg_column_to_nf ${COLUMN})'}}' "${_CFG_PATH}" +} + +_cfg_change() { + # Argument parser and sanity check + [[ $# != 3 ]] && {_msg ECHO "_cfg_change(): Expected 3 arguments"; return 1} + local COLUMN=${1} + local ROW=${2} + local VALUE=${3} + [[ ! _if_is_integer ${ROW} ]] && {_msg ECHO "_cfg_change(): Expected integer; return 1"} + + # Writes new version of file + awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$'$(_cfg_column_to_nf ${COLUMN})'='${VALUE}'} {print $0}}' "${_CFG_PATH}" > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + +} + +_cfg_drop() { + # Argument parser and sanity check + [[ -z $# != 2 ]] && {_msg ECHO "_cfg_drop(): Expected 2 arguments"; return 1} + local SUBCMD=${1}; shift + [[ ! _if_array_contains ${SUBCMD} row column ]] && {_msg ECHO "_cfg_drop(): Expected 'row' or 'column' as subcommand"; return 1} + + # Dispatcher + _cfg_drop_${SUBCMD} ${1} +} + +_cfg_drop_row() { + # Argument parser and sanity check + local ROW=${1} + [[ ${ROW} -mt $(awk 'BEGIN {FS="\t"; OFS="\t"}; {print NR}' ${_CFG_PATH}) ]] && {_msg ECHO "_cfg_drop_row(): Row number higher than available"} + + # Writes new version of file + awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$0="\b") {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + +} + +_cfg_drop_column() { + local COLUMN=${1} + local NF=$(_cfg_column_to_nf "${COLUMN}") + + # Writes new version of file + awk 'BEGIN {OFS="\t"}; {$'${NF}'="\b"; print &0}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} +} + +_cfg_insert() { + # Argument parser and sanity check + local valueList=(${@}) + local COLUMN_NO=$(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) + [[ "${#valueList[@]}" =! "${COLUMN_NO}" ]] && {_msg ECHO "_cfg_insert(): Number of arguments must be equal to ${COLUMN_NO}"; return 1} + + # Write row into file + printf "%s\t" ${valueList[@]} >> ${_CFG_PATH} +} + +_cfg_query() { + # Argument parser and sanity check + local CONDITION=${1} + + awk 'BEGIN {FS="\t"; OFS="\t"}; {if ('${CONDITION}') {print NR}}' "{_CFG_PATH}" +} From d20bc4e9865002cb3d29d073a6a18e6aebff914b Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 11 Jan 2018 10:09:00 -0900 Subject: [PATCH 14/22] Renamed config.sh to cfg.sh to match function name Fixed code-breaking bugs for cfg.sh for all base functions (i.e not dispatcher functions) Added test file for cfg function for all base functions (i.e not dispatcher functions) --- lib/cfg.sh | 190 +++++++++++++++++++++++++++++++++++++++++++++++ lib/config.sh | 169 ----------------------------------------- test/test-cfg.sh | 152 +++++++++++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+), 169 deletions(-) create mode 100644 lib/cfg.sh delete mode 100644 lib/config.sh create mode 100644 test/test-cfg.sh diff --git a/lib/cfg.sh b/lib/cfg.sh new file mode 100644 index 0000000..1368a50 --- /dev/null +++ b/lib/cfg.sh @@ -0,0 +1,190 @@ +#!/bin/bash + +# doc cfg { +# +# NAME +# cfg +# +# DESCRIPTION +# Reads and writes config files delimited by tabs, like fstab, using awk. +# +# USAGE +# _cfg +# +# COMMANDS +# set-file +# Sets path to file +# +# create +# Creates config file and assigns . +# +# print +# Prints value from and . +# +# change +# Assigns new to and . +# +# drop or . +# +# insert <...> +# Inserts new row with a value per column. Number of arguments must match number of columns. +# +# query +# Queries which fits the . +# +# +# CONDITIONALS +# +# +# +# EXIT VALUES +# 0 Success +# 1 Syntax or usage error +# 2 File not found +# 3 File already present +# 4 Row or column not found +# 5 Row or column already has value +# +# } + +_cfg_column_to_nf() { + # Argument parser and sanity check + [[ -z ${1+x} ]] && { _msg ECHO "_cfg_column_to_nf(): Expected column name"; return 1; } + local COLUMN=${1} + + # Queries list of columns + local columnList=(all $(awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR == 1 ) {print $0}}' ${_CFG_PATH})) + + # Checks if queried ${COLUMN} exists + if ! _if_array_contains ${COLUMN} ${columnList[@]}; then + _msg ECHO "_cfg_column_to_nf(): Column does not exist" + return 1 + else + # Finds what NF is associated with ${COLUMN} + local COUNT=0 + for column in ${columnList[@]}; do + [[ "${COLUMN}" == "${column}" ]] && echo "${COUNT}" + local COUNT=$(( ${COUNT} + 1 )) + done + return 0 + fi +} + +_cfg_set_file() { + # Argument parser and sanity check + [[ $# != 1 ]] && { _msg ECHO "_cfg_set_file(): Expected 1 argument"; return 1; } + + # Sets _CFG_PATH globally + _CFG_PATH="${1}" + _CFG_TMP_PATH="$(sed 's|\(.*\)\/|\1/.|' <<<"${_CFG_PATH}")" +} + +_cfg_create() { + # Argument parser and sanity check + [[ -z ${1+x} ]] && { _msg ECHO "_cfg_create(): Expected argument"; return 1; } + local colList=(${@}) + + # Creates config file + printf "%s\t" ${colList[@]} | awk 'BEGIN{OFS="\t";} {printf "%s\n",$0}' >> ${_CFG_PATH} +} + +_cfg_print() { + # Argument parser and sanity check + [[ $# != 2 ]] && { _msg ECHO "_cfg_print(): Expected 2 arguments"; return 1; } + local COLUMN=${1} + local ROW=${2} + + # Prints row of ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {print $'$(_cfg_column_to_nf ${COLUMN})'}}' "${_CFG_PATH}" +} + +_cfg_change() { + # Argument parser and sanity check + [[ $# != 3 ]] && { _msg ECHO "_cfg_change(): Expected 3 arguments"; return 1; } + local COLUMN=${1} + local ROW=${2} + local VALUE=${3} + local COLUMN_NO=$(_cfg_column_to_nf ${COLUMN}) + _if_is_integer ${ROW} || { _msg ECHO "_cfg_change(): Expected integer"; return 1; } + [[ ${ROW} > $(awk 'BEGIN{FS="\t"; OFS="\t"}; {print NR}' ${_CFG_PATH} | wc -l) ]] && { _msg ECHO "_cfg_change(): Row ${ROW} does not exist"; return 1; } + + # Writes new version of file + awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$'${COLUMN_NO}'="'${VALUE}'"} {print $0}}' "${_CFG_PATH}" > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + +} + +_cfg_drop() { + # Argument parser and sanity check + [[ $# != 2 ]] && { _msg ECHO "_cfg_drop(): Expected 2 arguments"; return 1; } + local SUBCMD=${1}; shift + [[ ! $(_if_array_contains ${SUBCMD} row column) ]] && { _msg ECHO "_cfg_drop(): Expected 'row' or 'column' as subcommand"; return 1; } + + # Dispatcher + eval _cfg_drop_${SUBCMD} ${1} +} + +_cfg_drop_row() { + # Argument parser and sanity check + local ROW=${1} + [[ ${ROW} > $(awk 'BEGIN {FS="\t"; OFS="\t"}; {print NR}' ${_CFG_PATH} | wc -l) ]] && { _msg ECHO "_cfg_drop_row(): Row ${ROW} does not exist"; return 1; } + + # Writes new version of file + awk 'BEGIN {OFS="\t"}; {if (NR != '${ROW}') {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + +} + +_cfg_drop_column() { + local COLUMN=${1} + local NF=$(_cfg_column_to_nf "${COLUMN}") + + # Writes new version of file + awk 'BEGIN {OFS="\t"}; {$'${NF}'=""; print $0}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} +} + +_cfg_insert() { + # Argument parser and sanity check + [[ $# != 2 ]] && { _msg ECHO "_cfg_insert(): Expected 2 arguments"; return 1; } + local SUBCMD=${1}; shift + [[ ! $(_if_array_contains ${SUBCMD} row column) ]] && { _msg ECHO "_cfg_insert(): Expected 'row' or 'column' as subcommand"; return 1; } + + # Dispatcher + eval _cfg_insert_${SUBCMD} ${1} +} + +_cfg_insert_column() { + # Argument parser and sanity check + local VALUE=${1} + local NX_COLUMN=$(( $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) + 1 )) + + # Write new version of header into file + awk 'BEGIN {OFS="\t"}; {if (NR == 1) {$'${NX_COLUMN}'="'${VALUE}'"} {print $0}}' "${_CFG_PATH}" > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} +} + +_cfg_insert_row() { + # Argument parser and sanity check + local valueList=(${@}) + local COLUMN_NO=$(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) + [[ "${#valueList[@]}" != "${COLUMN_NO}" ]] && { _msg ECHO "_cfg_insert_row(): Number of arguments must be equal to ${COLUMN_NO}"; return 1; } + + # Write row into file + printf "%s\t" ${valueList[@]} | awk 'BEGIN{OFS="\t";} {printf "%s\n",$0}' >> ${_CFG_PATH} +} + +_cfg_query() { + # Argument parser and sanity check + local CONDITION="${1}" + + awk 'BEGIN {FS="\t"; OFS="\t"}; {if ('${CONDITION}') {print NR}}' "${_CFG_PATH}" +} + +_cfg() { + # Sanity check and command parser + [[ -z ${1+x} ]] && { _msg ECHO "_cfg(): Expected command"; return 1; } + local cmdList="(set-file create print change drop insert query)" + local CMD=${1}; shift + [[ ! $(_if_array_contains ${CMD} ${cmdList[@]}) ]] && { _msg ECHO "_cfg(): Command specified not valid"; return 1; } + + # Dispatcher + eval _cfg_$(sed 's|-|_|' <<<"${CMD}") ${@} +} diff --git a/lib/config.sh b/lib/config.sh deleted file mode 100644 index 9742141..0000000 --- a/lib/config.sh +++ /dev/null @@ -1,169 +0,0 @@ -#/bin/bash - -# doc cfg { -# -# NAME -# cfg -# -# DESCRIPTION -# Reads and writes config files delimited by tabs, like fstab, using awk. -# -# USAGE -# _cfg -# -# COMMANDS -# set-file -# Sets path to file -# -# create -# Creates config file and assigns . -# -# print -# Prints value from and . -# -# change -# Assigns new to and . -# -# drop or . -# -# insert <...> -# Inserts new row with a value per column. Number of arguments must match number of columns. -# -# query -# Queries which fits the . -# -# -# CONDITIONALS -# -# -# -# EXIT VALUES -# 0 Success -# 1 Syntax or usage error -# 2 File not found -# 3 File already present -# 4 Row or column not found -# 5 Row or column already has value -# -# } - -_cfg() { - # Sanity check and command parser - [[ ! -z ${1+x} ]] && {_msg ECHO "_cfg(): Expected command"; return 1} - local cmdList="(set-file create print change drop insert query)" - local CMD=${1}; shift - [[ ! _if_array_contains ${CMD} ${cmdList[@]} ]] && {_msg ECHO "_cfg(): Command specified not valid; return 1"} - - # Dispatcher - _cfg_$(sed 's|-|_|' <<<"${CMD}") ${@} -} - -_cfg_column_to_nf() { - # Argument parser and sanity check - [[ ! -z ${1+x} ]] && {_msg ECHO "_cfg(): Expected column name"; return 1} - local COLUMN=${1} - - # Queries list of columns - local columnList=(all $(awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR = 0) {print '${0}'}}' ${_CFG_PATH})) - - # Checks if queried ${COLUMN} exists - if [ if ! _if_array_contains ${COLUMN} ${columnList[@]} ]; then - _msg ECHO "_cfg_column_to_nf(): Column does not exist" - return 1 - else - # Finds what NF is associated with ${COLUMN} - local COUNT=0 - for column ${columnList[@]}; do - [[ "${COLUMN}" == "${column}" ]] && echo "${COUNT}" - local COUNT=$(( ${COUNT} + 1 )) - return 0 - done - fi -} - -_cfg_set_file() { - # Argument parser and sanity check - [[ $# != 1 ]] && {_msg ECHO "_cfg_set_file(): Expected 1 argument"; return 1} - - # Sets _CFG_PATH globally - _CFG_PATH="${1}" - _CFG_TMP_PATH="$(sed 's|\(.*\)\/|\1/.|' <<<"${CFG_PATH}")" -} - -_cfg_create() { - # Argument parser and sanity check - [[ ! -z ${1+x} ]] && {_msg ECHO "_cfg_create(): Expected argument"; return 1} - local colList=(${@}) - - # Creates config file - printf "%s\t" ${colList[@]} >> ${_CFG_PATH} -} - -_cfg_print() { - # Argument parser and sanity check - [[ $# != 2 ]] && {_msg ECHO "_cfg_print(): Expected 2 arguments"; return 1} - local COLUMN=${1} - local ROW=${2} - - # Prints row of ${_CFG_PATH} - awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR='${ROW}') {print $'$(_cfg_column_to_nf ${COLUMN})'}}' "${_CFG_PATH}" -} - -_cfg_change() { - # Argument parser and sanity check - [[ $# != 3 ]] && {_msg ECHO "_cfg_change(): Expected 3 arguments"; return 1} - local COLUMN=${1} - local ROW=${2} - local VALUE=${3} - [[ ! _if_is_integer ${ROW} ]] && {_msg ECHO "_cfg_change(): Expected integer; return 1"} - - # Writes new version of file - awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$'$(_cfg_column_to_nf ${COLUMN})'='${VALUE}'} {print $0}}' "${_CFG_PATH}" > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} - -} - -_cfg_drop() { - # Argument parser and sanity check - [[ -z $# != 2 ]] && {_msg ECHO "_cfg_drop(): Expected 2 arguments"; return 1} - local SUBCMD=${1}; shift - [[ ! _if_array_contains ${SUBCMD} row column ]] && {_msg ECHO "_cfg_drop(): Expected 'row' or 'column' as subcommand"; return 1} - - # Dispatcher - _cfg_drop_${SUBCMD} ${1} -} - -_cfg_drop_row() { - # Argument parser and sanity check - local ROW=${1} - [[ ${ROW} -mt $(awk 'BEGIN {FS="\t"; OFS="\t"}; {print NR}' ${_CFG_PATH}) ]] && {_msg ECHO "_cfg_drop_row(): Row number higher than available"} - - # Writes new version of file - awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$0="\b") {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} - -} - -_cfg_drop_column() { - local COLUMN=${1} - local NF=$(_cfg_column_to_nf "${COLUMN}") - - # Writes new version of file - awk 'BEGIN {OFS="\t"}; {$'${NF}'="\b"; print &0}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} -} - -_cfg_insert() { - # Argument parser and sanity check - local valueList=(${@}) - local COLUMN_NO=$(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) - [[ "${#valueList[@]}" =! "${COLUMN_NO}" ]] && {_msg ECHO "_cfg_insert(): Number of arguments must be equal to ${COLUMN_NO}"; return 1} - - # Write row into file - printf "%s\t" ${valueList[@]} >> ${_CFG_PATH} -} - -_cfg_query() { - # Argument parser and sanity check - local CONDITION=${1} - - awk 'BEGIN {FS="\t"; OFS="\t"}; {if ('${CONDITION}') {print NR}}' "{_CFG_PATH}" -} diff --git a/test/test-cfg.sh b/test/test-cfg.sh new file mode 100644 index 0000000..285104d --- /dev/null +++ b/test/test-cfg.sh @@ -0,0 +1,152 @@ +#!/bin/bash + +source ../lib/if.sh +source ../lib/ansi.sh +source ../lib/msg.sh +source ../lib/cfg.sh +TMP=/tmp +testcolList=(COL1 COL2 COL3 COL4 COL5) +# cfg test + +bail() { + cat ${TMP}/test.cfg + rm ${TMP}/test.cfg + exit 1 +} + +_test_cfg_set_file() { + _msg EXEC "Testing _cfg_set_file()" + _cfg_set_file ${TMP}/test.cfg + [[ "${_CFG_PATH}" != "${TMP}/test.cfg" ]] && { _msg FAIL "_test_cfg_set_file(): \${_CFG_PATH} is '${_CFG_PATH}' rather than the expected '${TMP}/test.cfg'"; } + [[ "${_CFG_TMP_PATH}" != "${TMP}/.test.cfg" ]] && { _msg FAIL "_test_cfg_set_file(): \${_CFG_TMP_PATH} is '${_CFG_TMP_PATH}' rather than the expected '${TMP}/.test.cfg"; } + _msg OK +} + +_test_cfg_create() { + _msg EXEC "Testing _cfg_create()" + local CMD="_cfg_create ${testcolList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_create(): Error in function execution"; } + + local FC_OUTPUT="$(cat ${TMP}/test.cfg)" + local EX_OUTPUT="$(printf '%s\t' ${testcolList[@]})" + [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_create(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + _msg OK +} + +_test_cfg_column_to_nf() { + _msg EXEC "Testing _cfg_column_to_nf()" + local argList=(all ${testcolList[@]}) + _cfg_column_to_nf ${argList[1]} >${STDERR} 2>&1 || { _msg FAIL "test_cfg_column_to_nf(): Error in function execution"; } + + for no in {0..5}; do + local FC_OUTPUT="$(_cfg_column_to_nf ${argList[${no}]})" + local EX_OUTPUT="${no}" + [[ ${FC_OUTPUT} -ne ${EX_OUTPUT} ]] && { _msg FAIL "_test_cfg_column_to_nf(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + done + _msg OK +} + +_test_cfg_print() { + _msg EXEC "Testing _cfg_print()" + local argList=(all 1) + local CMD="_cfg_print ${argList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_print(): Error in function execution"; } + + local FC_OUTPUT="$(eval ${CMD})" + local EX_OUTPUT="$(printf '%s\t' ${testcolList[@]})" + [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_print(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + _msg OK +} + +_test_cfg_insert_row() { + _msg EXEC "Testing _cfg_insert_row()" + local argList=(EL1 EL2 EL3 EL4 EL5) + local CMD="_cfg_insert_row ${argList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_insert_row(): Error in function execution"; } + + local FC_OUTPUT="$(_cfg_print all 2)" + local EX_OUTPUT="$(printf '%s\t' ${argList[@]})" + [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_insert_row(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + + awk 'BEGIN {OFS="\t"}; {if (NR != 2) {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + _msg OK +} + +_test_cfg_insert_column() { + _msg EXEC "Testing _cfg_insert_column()" + local argList=(COL6) + local CMD="_cfg_insert_column ${argList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_insert_column(): Error in function execution"; } + + local fcoutputList=($(_cfg_print all 1)) + local exoutputList=(${testcolList[@]} COL6) + + [[ "${fcoutputList[@]}" != "${exoutputList[@]}" ]] && { _msg FAIL "_test_cfg_insert_column(): Output '${fcoutputList[@]}' expected to be '${exoutputList[@]}'"; } + + awk 'BEGIN {OFS="\t"}; {$6=""; print $0}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + _msg OK +} + +_test_cfg_change() { + _msg EXEC "Testing _cfg_change()" + _cfg_insert_row ${testcolList[@]} + local argList=(COL1 2 EL1_CH) + local CMD="_cfg_change ${argList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_change(): Error in function execution"; } + local FC_OUTPUT="$(_cfg_print COL1 2)" + local EX_OUTPUT="EL1_CH" + [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_change(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + _cfg_drop_row 2 + _msg OK +} + +_test_cfg_drop_row() { + _msg EXEC "Testing _cfg_drop_row()" + _cfg_insert_row ${testcolList[@]} + local argList=(2) + local CMD="_cfg_drop_row ${argList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_drop_row(): Error in function execution"; } + + FC_OUTPUT="$(awk '{print NR}' ${TMP}/test.cfg | wc -l)" + EX_OUTPUT=1 + [[ ${FC_OUTPUT} != ${EX_OUTPUT} ]] && { _msg FAIL "_test_cfg_drop_row(): Output '${FC_OUTPUT}' expected to be ${EX_OUTPUT}'"; } + _msg OK +} + +_test_cfg_drop_column() { + _msg EXEC "Testing _cfg_drop_column()" + _cfg_insert_column "COL6" + local argList="COL6" + local CMD="_cfg_drop_column ${argList[@]}" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_drop_column(): Error in function execution"; } + + FC_OUTPUT="$(printf '%s ' $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print $0}}' ${_CFG_PATH}))" + EX_OUTPUT="$(printf '%s ' ${testcolList[@]})" + [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_drop_column(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + _msg OK +} + +_test_cfg_query() { + _msg EXEC "Testing _cfg_query" + _cfg_insert_row "EL1 EL2 EL3 EL4 EL5" + _cfg_insert_row "EL6 EL7 EL8 EL9 EL10" + local ARG="\$1==\"EL6\"" + local CMD="_cfg_query '${ARG}'" + eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_query(): Error in function execution"; } + + FC_OUTPUT=$(eval ${CMD}) + EX_OUTPUT=3 + [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_query(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } + +awk 'BEGIN {OFS="\t"}; {if (NR == 1) {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + _msg OK +} + +testList=(cfg_set_file cfg_create cfg_column_to_nf cfg_print cfg_query cfg_insert_row cfg_insert_column cfg_drop_row cfg_drop_column cfg_change) + +_msg ECHO "cfg function test suite started" +for test in ${testList[@]}; do + eval _test_${test} +done +rm ${TMP}/test.cfg +_msg ECHO "cfg function test suite ended" From 351516d54c78312f37c3a4b769cc699856d6aaad Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 11 Jan 2018 11:05:36 -0900 Subject: [PATCH 15/22] Fixed dispatcher functions and parser and sanity checks _cfg_drop_column now leaves no trailing tab Updated documentation for _cfg insert --- lib/cfg.sh | 17 +++++++++-------- test/test-cfg.sh | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/cfg.sh b/lib/cfg.sh index 1368a50..61ede8c 100644 --- a/lib/cfg.sh +++ b/lib/cfg.sh @@ -27,8 +27,8 @@ # drop or . # -# insert <...> -# Inserts new row with a value per column. Number of arguments must match number of columns. +# insert +# Inserts new row or column. Number of row values must match number of columns. # # query # Queries which fits the . @@ -118,7 +118,7 @@ _cfg_drop() { # Argument parser and sanity check [[ $# != 2 ]] && { _msg ECHO "_cfg_drop(): Expected 2 arguments"; return 1; } local SUBCMD=${1}; shift - [[ ! $(_if_array_contains ${SUBCMD} row column) ]] && { _msg ECHO "_cfg_drop(): Expected 'row' or 'column' as subcommand"; return 1; } + _if_array_contains ${SUBCMD} row column || { _msg ECHO "_cfg_drop(): Expected 'row' or 'column' as subcommand"; return 1; } # Dispatcher eval _cfg_drop_${SUBCMD} ${1} @@ -139,20 +139,20 @@ _cfg_drop_column() { local NF=$(_cfg_column_to_nf "${COLUMN}") # Writes new version of file - awk 'BEGIN {OFS="\t"}; {$'${NF}'=""; print $0}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; $'${NF}'="";1' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} } _cfg_insert() { # Argument parser and sanity check - [[ $# != 2 ]] && { _msg ECHO "_cfg_insert(): Expected 2 arguments"; return 1; } local SUBCMD=${1}; shift - [[ ! $(_if_array_contains ${SUBCMD} row column) ]] && { _msg ECHO "_cfg_insert(): Expected 'row' or 'column' as subcommand"; return 1; } + _if_array_contains ${SUBCMD} row column || { _msg ECHO "_cfg_insert(): Expected 'row' or 'column' as subcommand"; return 1; } # Dispatcher - eval _cfg_insert_${SUBCMD} ${1} + eval _cfg_insert_${SUBCMD} ${@} } _cfg_insert_column() { + [[ $# != 1 ]] && { _msg ECHO "_cfg_insert_column(): Expected 1 argument"; return 1; } # Argument parser and sanity check local VALUE=${1} local NX_COLUMN=$(( $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) + 1 )) @@ -162,6 +162,7 @@ _cfg_insert_column() { } _cfg_insert_row() { + [[ -z ${1+x} ]] && { _msg ECHO "_cfg_insert_row(): Expected at least 1 argument"; return 1; } # Argument parser and sanity check local valueList=(${@}) local COLUMN_NO=$(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) @@ -183,7 +184,7 @@ _cfg() { [[ -z ${1+x} ]] && { _msg ECHO "_cfg(): Expected command"; return 1; } local cmdList="(set-file create print change drop insert query)" local CMD=${1}; shift - [[ ! $(_if_array_contains ${CMD} ${cmdList[@]}) ]] && { _msg ECHO "_cfg(): Command specified not valid"; return 1; } + _if_array_contains ${CMD} ${cmdList[@]} || { _msg ECHO "_cfg(): Command specified not valid"; return 1; } # Dispatcher eval _cfg_$(sed 's|-|_|' <<<"${CMD}") ${@} diff --git a/test/test-cfg.sh b/test/test-cfg.sh index 285104d..525c115 100644 --- a/test/test-cfg.sh +++ b/test/test-cfg.sh @@ -130,7 +130,7 @@ _test_cfg_query() { _msg EXEC "Testing _cfg_query" _cfg_insert_row "EL1 EL2 EL3 EL4 EL5" _cfg_insert_row "EL6 EL7 EL8 EL9 EL10" - local ARG="\$1==\"EL6\"" + local ARG='$1=="EL6"' local CMD="_cfg_query '${ARG}'" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_query(): Error in function execution"; } From 93948910e3163a48e5390dc43a44aa0f4b11d171 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 11 Jan 2018 14:35:10 -0900 Subject: [PATCH 16/22] Added build script. Moved libraries from src to lib --- build.sh | 9 +++++++++ {lib => src}/ansi.sh | 0 {lib => src}/cfg.sh | 0 {lib => src}/if.sh | 0 {lib => src}/msg.sh | 0 test/bui | 4 ++++ 6 files changed, 13 insertions(+) create mode 100644 build.sh rename {lib => src}/ansi.sh (100%) rename {lib => src}/cfg.sh (100%) rename {lib => src}/if.sh (100%) rename {lib => src}/msg.sh (100%) create mode 100644 test/bui diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..c87ffb7 --- /dev/null +++ b/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +EXEC=bunc + +echo -e "#!/bin/bash\n" > ${EXEC} + +for file in $(find src/ -type f); do + awk '!/^ *#/ && NF' ${file} >> ${EXEC} +done diff --git a/lib/ansi.sh b/src/ansi.sh similarity index 100% rename from lib/ansi.sh rename to src/ansi.sh diff --git a/lib/cfg.sh b/src/cfg.sh similarity index 100% rename from lib/cfg.sh rename to src/cfg.sh diff --git a/lib/if.sh b/src/if.sh similarity index 100% rename from lib/if.sh rename to src/if.sh diff --git a/lib/msg.sh b/src/msg.sh similarity index 100% rename from lib/msg.sh rename to src/msg.sh diff --git a/test/bui b/test/bui new file mode 100644 index 0000000..7a028d1 --- /dev/null +++ b/test/bui @@ -0,0 +1,4 @@ +echorm ${EXEC} +-e "#!/bin/bash\n" > ${EXEC} +1Oautomatically escape when changing lines vim +2 From 10172b0f21d51d1a30a04dc0d24cf386a3ca2365 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 11 Jan 2018 14:43:41 -0900 Subject: [PATCH 17/22] Updated PKGBUILD to reflect name and build changes --- CHANGELOG.md | 5 ++++- PKGBUILD | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad59473..cdb4a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,5 @@ ### v0.1 -* Added log library +* Added if library +* Added msg library +* Added ansi library +* Added cfg library diff --git a/PKGBUILD b/PKGBUILD index 9b04981..002a678 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ -pkgname=bash-libs +pkgname=bunc pkgver=0.1 pkgrel=1 -pkgdesc="A collection of bash libraries that I tend to use in my scripts" +pkgdesc="A functional bash library" arch=(any) changelog=CHANGELOG.md license=('GPLv3') @@ -20,10 +20,12 @@ prepare(){ git checkout ${pkgver} } -package() { - - # Install the scripts - for libs in $(find ${srcdir}/bash-libs/libs/. -type f -printf %f); do - install -Dm644 "${srcdir}/bash-libs/libs/${libs}" "${pkgdir}/usr/lib/bash-libs/$(echo ${libs} | sed 's|.sh||')" - done +build(){ + cd ${srcdir}/bunc + bash ./build +} + +package() { + # Install the library + install -Dm644 "${srcdir}/bunc/bunc /usr/lib/bash/bunc" } From 5eb6c5cd38ebfdb6a9ccd01af9b5baca7cc556b5 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 11 Jan 2018 14:45:04 -0900 Subject: [PATCH 18/22] Updated README and CHANGELOG --- CHANGELOG.md | 5 +++++ README.md | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..cdb4a35 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +### v0.1 +* Added if library +* Added msg library +* Added ansi library +* Added cfg library diff --git a/README.md b/README.md index 8486e18..c28dd6b 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,6 @@ Set of if functions to make life easier ## _ansi Sets terminal properties such as cursor position and text color using ANSI escape sequences. + +## _cfg +Reads and writes config files delimited by tabs, like fstab, using aw. From e7f6e27c6172b513e95b1c67b76378ce0608f1ea Mon Sep 17 00:00:00 2001 From: ayakael Date: Sat, 13 Jan 2018 15:16:14 -0900 Subject: [PATCH 19/22] build.sh now executable --- build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 From 9f40c6fec0eafce5f2aa71d87df3e6ce556331af Mon Sep 17 00:00:00 2001 From: ayakael Date: Sat, 13 Jan 2018 15:20:24 -0900 Subject: [PATCH 20/22] Updated PKGBUILd to work with new ./build.sh system --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 002a678..cfb95c7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,10 +22,10 @@ prepare(){ build(){ cd ${srcdir}/bunc - bash ./build + ./build.sh } package() { # Install the library - install -Dm644 "${srcdir}/bunc/bunc /usr/lib/bash/bunc" + install -Dm644 "${srcdir}/bunc/bunc" "${pkgdir}/usr/lib/bash/bunc" } From a624cae51ba8a0cbdb3b3bd657ed8674135a85ad Mon Sep 17 00:00:00 2001 From: ayakael Date: Mon, 26 Mar 2018 22:39:58 -0400 Subject: [PATCH 21/22] File is not defined explicitely rather than globally --- src/cfg.sh | 82 ++++++++++++++++++++++++++---------------------- test/test-cfg.sh | 54 ++++++++++++++----------------- 2 files changed, 69 insertions(+), 67 deletions(-) diff --git a/src/cfg.sh b/src/cfg.sh index 61ede8c..d9de4d8 100644 --- a/src/cfg.sh +++ b/src/cfg.sh @@ -9,11 +9,9 @@ # Reads and writes config files delimited by tabs, like fstab, using awk. # # USAGE -# _cfg +# _cfg # # COMMANDS -# set-file -# Sets path to file # # create # Creates config file and assigns . @@ -50,11 +48,12 @@ _cfg_column_to_nf() { # Argument parser and sanity check - [[ -z ${1+x} ]] && { _msg ECHO "_cfg_column_to_nf(): Expected column name"; return 1; } - local COLUMN=${1} + [[ $# != 2 ]] && { _msg ECHO "_cfg_column_to_nf(): Expected 2 arguments"; return 1; } + local FILE="${1}" + local COLUMN=${2} # Queries list of columns - local columnList=(all $(awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR == 1 ) {print $0}}' ${_CFG_PATH})) + local columnList=(all $(awk 'BEGIN {FS="\t"; OFS="\t"}; {if (NR == 1 ) {print $0}}' ${FILE})) # Checks if queried ${COLUMN} exists if ! _if_array_contains ${COLUMN} ${columnList[@]}; then @@ -71,75 +70,80 @@ _cfg_column_to_nf() { fi } -_cfg_set_file() { - # Argument parser and sanity check - [[ $# != 1 ]] && { _msg ECHO "_cfg_set_file(): Expected 1 argument"; return 1; } +_cfg_tmp_file() { + local FILE="${1}" - # Sets _CFG_PATH globally - _CFG_PATH="${1}" - _CFG_TMP_PATH="$(sed 's|\(.*\)\/|\1/.|' <<<"${_CFG_PATH}")" + echo -n "$(dirname ${FILE})/.$(basename ${FILE})" } _cfg_create() { # Argument parser and sanity check - [[ -z ${1+x} ]] && { _msg ECHO "_cfg_create(): Expected argument"; return 1; } + [[ $# -lt 2 ]] && { _msg ECHO "_cfg_create(): Expected at least 2 arguments"; return 1; } + local FILE="${1}"; shift local colList=(${@}) # Creates config file - printf "%s\t" ${colList[@]} | awk 'BEGIN{OFS="\t";} {printf "%s\n",$0}' >> ${_CFG_PATH} + printf "%s\t" ${colList[@]} | awk 'BEGIN{OFS="\t";} {printf "%s\n",$0}' >> ${FILE} } _cfg_print() { # Argument parser and sanity check - [[ $# != 2 ]] && { _msg ECHO "_cfg_print(): Expected 2 arguments"; return 1; } - local COLUMN=${1} - local ROW=${2} + [[ $# != 3 ]] && { _msg ECHO "_cfg_print(): Expected 3 arguments"; return 1; } + local FILE="${1}" + local COLUMN=${2} + local ROW=${3} # Prints row of ${_CFG_PATH} - awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {print $'$(_cfg_column_to_nf ${COLUMN})'}}' "${_CFG_PATH}" + awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {print $'$(_cfg_column_to_nf ${COLUMN})'}}' "${FILE}" } _cfg_change() { # Argument parser and sanity check - [[ $# != 3 ]] && { _msg ECHO "_cfg_change(): Expected 3 arguments"; return 1; } - local COLUMN=${1} - local ROW=${2} - local VALUE=${3} + [[ $# != 4 ]] && { _msg ECHO "_cfg_change(): Expected 4 arguments"; return 1; } + local FILE="${1}" + local COLUMN=${2} + local ROW=${3} + local VALUE=${4} + local TMP_FILE=$(_cfg_tmp_file ${FILE}) local COLUMN_NO=$(_cfg_column_to_nf ${COLUMN}) _if_is_integer ${ROW} || { _msg ECHO "_cfg_change(): Expected integer"; return 1; } [[ ${ROW} > $(awk 'BEGIN{FS="\t"; OFS="\t"}; {print NR}' ${_CFG_PATH} | wc -l) ]] && { _msg ECHO "_cfg_change(): Row ${ROW} does not exist"; return 1; } # Writes new version of file - awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$'${COLUMN_NO}'="'${VALUE}'"} {print $0}}' "${_CFG_PATH}" > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; {if (NR == '${ROW}') {$'${COLUMN_NO}'="'${VALUE}'"} {print $0}}' "${FILE}" > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} } _cfg_drop() { # Argument parser and sanity check - [[ $# != 2 ]] && { _msg ECHO "_cfg_drop(): Expected 2 arguments"; return 1; } + [[ $# != 3 ]] && { _msg ECHO "_cfg_drop(): Expected 3 arguments"; return 1; } local SUBCMD=${1}; shift _if_array_contains ${SUBCMD} row column || { _msg ECHO "_cfg_drop(): Expected 'row' or 'column' as subcommand"; return 1; } # Dispatcher - eval _cfg_drop_${SUBCMD} ${1} + eval _cfg_drop_${SUBCMD} ${@} } _cfg_drop_row() { # Argument parser and sanity check - local ROW=${1} - [[ ${ROW} > $(awk 'BEGIN {FS="\t"; OFS="\t"}; {print NR}' ${_CFG_PATH} | wc -l) ]] && { _msg ECHO "_cfg_drop_row(): Row ${ROW} does not exist"; return 1; } + local FILE="${1}" + local TMP_FILE="$(_cfg_tmp_file ${FILE})" + local ROW=${2} + [[ ${ROW} > $(awk 'BEGIN {FS="\t"; OFS="\t"}; {print NR}' ${FILE} | wc -l) ]] && { _msg ECHO "_cfg_drop_row(): Row ${ROW} does not exist"; return 1; } # Writes new version of file - awk 'BEGIN {OFS="\t"}; {if (NR != '${ROW}') {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; {if (NR != '${ROW}') {print $0}}' ${FILE} > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} } _cfg_drop_column() { - local COLUMN=${1} + local FILE="${1}" + local TMP_FILE="$(_cfg_tmp_file ${FILE})" + local COLUMN=${2} local NF=$(_cfg_column_to_nf "${COLUMN}") # Writes new version of file - awk 'BEGIN {OFS="\t"}; $'${NF}'="";1' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; $'${NF}'="";1' ${FILE} > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} } _cfg_insert() { @@ -154,29 +158,33 @@ _cfg_insert() { _cfg_insert_column() { [[ $# != 1 ]] && { _msg ECHO "_cfg_insert_column(): Expected 1 argument"; return 1; } # Argument parser and sanity check - local VALUE=${1} - local NX_COLUMN=$(( $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) + 1 )) + local FILE="${1}" + local TMP_FILE="$(_cfg_tmp_file ${FILE})" + local VALUE=${2} + local NX_COLUMN=$(( $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${FILE}) + 1 )) # Write new version of header into file - awk 'BEGIN {OFS="\t"}; {if (NR == 1) {$'${NX_COLUMN}'="'${VALUE}'"} {print $0}}' "${_CFG_PATH}" > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; {if (NR == 1) {$'${NX_COLUMN}'="'${VALUE}'"} {print $0}}' "${FILE}" > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} } _cfg_insert_row() { [[ -z ${1+x} ]] && { _msg ECHO "_cfg_insert_row(): Expected at least 1 argument"; return 1; } # Argument parser and sanity check + local FILE="${1}"; shift local valueList=(${@}) - local COLUMN_NO=$(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${_CFG_PATH}) + local COLUMN_NO=$(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print NF}}' ${FILE}) [[ "${#valueList[@]}" != "${COLUMN_NO}" ]] && { _msg ECHO "_cfg_insert_row(): Number of arguments must be equal to ${COLUMN_NO}"; return 1; } # Write row into file - printf "%s\t" ${valueList[@]} | awk 'BEGIN{OFS="\t";} {printf "%s\n",$0}' >> ${_CFG_PATH} + printf "%s\t" ${valueList[@]} | awk 'BEGIN{OFS="\t";} {printf "%s\n",$0}' >> ${FILE} } _cfg_query() { # Argument parser and sanity check - local CONDITION="${1}" + local FILE="${1}" + local CONDITION="${2}" - awk 'BEGIN {FS="\t"; OFS="\t"}; {if ('${CONDITION}') {print NR}}' "${_CFG_PATH}" + awk 'BEGIN {FS="\t"; OFS="\t"}; {if ('${CONDITION}') {print NR}}' "${FILE}" } _cfg() { diff --git a/test/test-cfg.sh b/test/test-cfg.sh index 525c115..172b55a 100644 --- a/test/test-cfg.sh +++ b/test/test-cfg.sh @@ -1,10 +1,12 @@ #!/bin/bash -source ../lib/if.sh -source ../lib/ansi.sh -source ../lib/msg.sh -source ../lib/cfg.sh +source ../srv/if.sh +source ../src/ansi.sh +source ../src/msg.sh +source ../src/cfg.sh TMP=/tmp +FILE=${TMP}/cfg.db +TMP_FILE=${TMP}/.cfg.db testcolList=(COL1 COL2 COL3 COL4 COL5) # cfg test @@ -14,17 +16,9 @@ bail() { exit 1 } -_test_cfg_set_file() { - _msg EXEC "Testing _cfg_set_file()" - _cfg_set_file ${TMP}/test.cfg - [[ "${_CFG_PATH}" != "${TMP}/test.cfg" ]] && { _msg FAIL "_test_cfg_set_file(): \${_CFG_PATH} is '${_CFG_PATH}' rather than the expected '${TMP}/test.cfg'"; } - [[ "${_CFG_TMP_PATH}" != "${TMP}/.test.cfg" ]] && { _msg FAIL "_test_cfg_set_file(): \${_CFG_TMP_PATH} is '${_CFG_TMP_PATH}' rather than the expected '${TMP}/.test.cfg"; } - _msg OK -} - _test_cfg_create() { _msg EXEC "Testing _cfg_create()" - local CMD="_cfg_create ${testcolList[@]}" + local CMD="_cfg_create ${FILE} ${testcolList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_create(): Error in function execution"; } local FC_OUTPUT="$(cat ${TMP}/test.cfg)" @@ -35,7 +29,7 @@ _test_cfg_create() { _test_cfg_column_to_nf() { _msg EXEC "Testing _cfg_column_to_nf()" - local argList=(all ${testcolList[@]}) + local argList=(${FILE} all ${testcolList[@]}) _cfg_column_to_nf ${argList[1]} >${STDERR} 2>&1 || { _msg FAIL "test_cfg_column_to_nf(): Error in function execution"; } for no in {0..5}; do @@ -48,7 +42,7 @@ _test_cfg_column_to_nf() { _test_cfg_print() { _msg EXEC "Testing _cfg_print()" - local argList=(all 1) + local argList=(${FILE} all 1) local CMD="_cfg_print ${argList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_print(): Error in function execution"; } @@ -60,7 +54,7 @@ _test_cfg_print() { _test_cfg_insert_row() { _msg EXEC "Testing _cfg_insert_row()" - local argList=(EL1 EL2 EL3 EL4 EL5) + local argList=(${FILE} EL1 EL2 EL3 EL4 EL5) local CMD="_cfg_insert_row ${argList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_insert_row(): Error in function execution"; } @@ -68,13 +62,13 @@ _test_cfg_insert_row() { local EX_OUTPUT="$(printf '%s\t' ${argList[@]})" [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_insert_row(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } - awk 'BEGIN {OFS="\t"}; {if (NR != 2) {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; {if (NR != 2) {print $0}}' ${FILE} > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} _msg OK } _test_cfg_insert_column() { _msg EXEC "Testing _cfg_insert_column()" - local argList=(COL6) + local argList=(${FILE} COL6) local CMD="_cfg_insert_column ${argList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_insert_column(): Error in function execution"; } @@ -83,27 +77,27 @@ _test_cfg_insert_column() { [[ "${fcoutputList[@]}" != "${exoutputList[@]}" ]] && { _msg FAIL "_test_cfg_insert_column(): Output '${fcoutputList[@]}' expected to be '${exoutputList[@]}'"; } - awk 'BEGIN {OFS="\t"}; {$6=""; print $0}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} + awk 'BEGIN {OFS="\t"}; {$6=""; print $0}' ${FILE} > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} _msg OK } _test_cfg_change() { _msg EXEC "Testing _cfg_change()" - _cfg_insert_row ${testcolList[@]} - local argList=(COL1 2 EL1_CH) + _cfg_insert_row ${FILE} ${testcolList[@]} + local argList=(${FILE} COL1 2 EL1_CH) local CMD="_cfg_change ${argList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_change(): Error in function execution"; } local FC_OUTPUT="$(_cfg_print COL1 2)" local EX_OUTPUT="EL1_CH" [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_change(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } - _cfg_drop_row 2 + _cfg_drop_row ${FILE} 2 _msg OK } _test_cfg_drop_row() { _msg EXEC "Testing _cfg_drop_row()" - _cfg_insert_row ${testcolList[@]} - local argList=(2) + _cfg_insert_row ${FILE} ${testcolList[@]} + local argList=(${FILE} 2) local CMD="_cfg_drop_row ${argList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_drop_row(): Error in function execution"; } @@ -115,12 +109,12 @@ _test_cfg_drop_row() { _test_cfg_drop_column() { _msg EXEC "Testing _cfg_drop_column()" - _cfg_insert_column "COL6" + _cfg_insert_column ${FILE} "COL6" local argList="COL6" local CMD="_cfg_drop_column ${argList[@]}" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_drop_column(): Error in function execution"; } - FC_OUTPUT="$(printf '%s ' $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print $0}}' ${_CFG_PATH}))" + FC_OUTPUT="$(printf '%s ' $(awk 'BEGIN{OFS="\t"}; {if (NR == 1) {print $0}}' ${FILE}))" EX_OUTPUT="$(printf '%s ' ${testcolList[@]})" [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_drop_column(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } _msg OK @@ -128,17 +122,17 @@ _test_cfg_drop_column() { _test_cfg_query() { _msg EXEC "Testing _cfg_query" - _cfg_insert_row "EL1 EL2 EL3 EL4 EL5" - _cfg_insert_row "EL6 EL7 EL8 EL9 EL10" + _cfg_insert_row ${FILE} "EL1 EL2 EL3 EL4 EL5" + _cfg_insert_row ${FILE} "EL6 EL7 EL8 EL9 EL10" local ARG='$1=="EL6"' - local CMD="_cfg_query '${ARG}'" + local CMD="_cfg_query ${FILE} '${ARG}'" eval ${CMD} >${STDERR} 2>&1 || { _msg FAIL "_test_cfg_query(): Error in function execution"; } FC_OUTPUT=$(eval ${CMD}) EX_OUTPUT=3 [[ "${FC_OUTPUT}" != "${EX_OUTPUT}" ]] && { _msg FAIL "_test_cfg_query(): Output '${FC_OUTPUT}' expected to be '${EX_OUTPUT}'"; } -awk 'BEGIN {OFS="\t"}; {if (NR == 1) {print $0}}' ${_CFG_PATH} > ${_CFG_TMP_PATH} && mv ${_CFG_TMP_PATH} ${_CFG_PATH} +awk 'BEGIN {OFS="\t"}; {if (NR == 1) {print $0}}' ${FILE} > ${TMP_FILE} && mv ${TMP_FILE} ${FILE} _msg OK } From 95d34510868d9d22348d16f67f09bb9395ec965a Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 21 Feb 2019 14:47:26 -0500 Subject: [PATCH 22/22] Moved /tmp to ${_OPT_TMP} option --- src/msg.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msg.sh b/src/msg.sh index 5a4fd79..8911817 100644 --- a/src/msg.sh +++ b/src/msg.sh @@ -39,7 +39,7 @@ # Prints a normal message # } -STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) +STDERR=$(mktemp ${_OPT_TMP}/STDERR.XXXXXXXXXX) INDENT=0 bail() { return 1 @@ -77,7 +77,7 @@ _msg(){ cat ${STDERR} fi rm ${STDERR} - STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) + STDERR=$(mktemp ${_OPT_TMP}/STDERR.XXXXXXXXXX) echo -en "$(_ansi lt 100)$(_ansi dn "${HEIGHT}")" elif [ ${1} = "FAIL" ]; then shift; @@ -92,7 +92,7 @@ _msg(){ cat ${STDERR} fi rm ${STDERR} - STDERR=$(mktemp /tmp/STDERR.XXXXXXXXXX) + STDERR=$(mktemp ${_OPT_TMP}/STDERR.XXXXXXXXXX) echo -en "$(_ansi lt 100)$(_ansi dn "${HEIGHT}")" bail elif [ ${1} = "ECHO" ]; then