artools/0.31rc (#75)

Co-authored-by: Artoo <artoo@artixlinux.org>
Reviewed-on: artix/artools#75

.gitignore

@@ -8,3 +8,7 @@ iso-profiles
 live-services
 artixpkg_cmds
 PKGBUILD
+
+contrib/artixlinux
+build/
+tmp/

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<https://www.gnu.org/licenses/>.
+
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Makefile

@@ -1,50 +1,40 @@
-V=0.30
+SHELL=/bin/bash
+
+V=0.31
+BUILDTOOLVER ?= $(V)
+
+CHROOTVER=0.11
 
 TOOLS = artools
-PREFIX ?= /usr
 SYSCONFDIR = /etc
-BINDIR = $(PREFIX)/bin
+PREFIX = /usr/local
-LIBDIR = $(PREFIX)/share
+LIBDIR = $(PREFIX)/share/$(TOOLS)/lib
-DATADIR = $(PREFIX)/share
+DATADIR = $(PREFIX)/share/$(TOOLS)
+BUILDDIR = build
 
-BASE_CONF = \
+rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
-	data/conf/artools-base.conf
 
-BASE_BIN = \
+BINPROGS_SRC_BASE = $(wildcard src/base/*.in)
-	bin/base/chroot-run \
+BINPROGS_BASE = $(addprefix $(BUILDDIR)/,$(patsubst src/base/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC_BASE))))
-	bin/base/mkchroot \
+BINPROGS_SRC_PKG = $(wildcard src/pkg/*.in)
-	bin/base/basestrap \
+BINPROGS_PKG = $(addprefix $(BUILDDIR)/,$(patsubst src/pkg/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC_PKG))))
-	bin/base/artix-chroot \
+BINPROGS_SRC_ISO = $(wildcard src/iso/*.in)
-	bin/base/fstabgen
+BINPROGS_ISO = $(addprefix $(BUILDDIR)/,$(patsubst src/iso/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC_ISO))))
 
-BASE_LIB =\
+LIBRARY_SRC_BASE = $(call rwildcard,src/lib/base,*.sh)
-	$(wildcard lib/base/*.sh)
+LIBRARY_BASE = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC_BASE))))
+LIBRARY_SRC_PKG = $(call rwildcard,src/lib/pkg,*.sh)
+LIBRARY_PKG = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC_PKG))))
+LIBRARY_SRC_ISO = $(call rwildcard,src/lib/iso,*.sh)
+LIBRARY_ISO = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC_ISO))))
 
-PACMAN_CONF = \
+MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
-	$(wildcard data/pacman/*.conf)
+PACMAN_CONFIGS=$(wildcard config/pacman/*)
+SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 
-PKG_CONF = \
+TOOLS_CONFIGS_BASE=$(wildcard config/conf/*base*)
-	data/conf/artools-pkg.conf
+TOOLS_CONFIGS_PKG=$(wildcard config/conf/*pkg*)
-
+TOOLS_CONFIGS_ISO=$(wildcard config/conf/*iso*)
-SETARCH_ALIASES = \
-
-PKG_BIN = \
-	bin/pkg/buildpkg \
-	bin/pkg/deploypkg \
-	bin/pkg/links-add \
-	bin/pkg/mkchrootpkg \
-	bin/pkg/pkg2yaml \
-	bin/pkg/makerepropkg \
-	bin/pkg/lddd \
-	bin/pkg/checkpkg \
-	bin/pkg/finddeps \
-	bin/pkg/find-libdeps \
-	bin/pkg/signpkg \
-	bin/pkg/checkrepo \
-	bin/pkg/artixpkg \
-	bin/pkg/mkdepgraph \
-	bin/pkg/diffpkg \
-	bin/pkg/export-pkgbuild-keys
 
 LN_BUILDPKG = \
 	buildpkg-system \
@@ -56,136 +46,130 @@ LN_BUILDPKG = \
 	buildpkg-lib32 \
 	buildpkg-lib32-gremlins \
 	buildpkg-lib32-goblins \
-	buildpkg-kde-wobble \
+	buildpkg-galaxy \
-	buildpkg-gnome-wobble
+	buildpkg-galaxy-gremlins \
-
+	buildpkg-galaxy-goblins
-PKG_LIB =\
-	$(wildcard lib/pkg/*.sh)
-
-PKG_LIB_API =\
-	$(wildcard lib/pkg/api/*.sh)
-
-PKG_LIB_CI =\
-	$(wildcard lib/pkg/ci/*.sh) \
-
-PKG_LIB_GIT =\
-	$(wildcard lib/pkg/git/*.sh) \
-
-PKG_LIB_REPO =\
-	$(wildcard lib/pkg/repo/*.sh)
-
-# PKG_DATA = \
-# 	data/valid-names.conf
-
-MAKEPKG_CONF = \
-	data/makepkg/x86_64.conf \
-
-PATCHES = \
-	$(wildcard data/patches/*.patch)
-
-ISO_CONF = \
-	data/conf/artools-iso.conf
-
-ISO_BIN = \
-	bin/iso/buildiso
-
-ISO_LIB =\
-	$(wildcard lib/iso/*.sh)
 
 LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
 
-DIRMODE = -dm0755
+all: binprogs_base binprogs_pkg binprogs_iso library_base library_pkg library_iso conf_base conf_pkg conf_iso
-FILEMODE = -m0644
+binprogs_base: $(BINPROGS_BASE)
-MODE =  -m0755
+binprogs_pkg: $(BINPROGS_PKG)
-LN = ln -sf
+binprogs_iso: $(BINPROGS_ISO)
-RM = rm -f
+library_base: $(LIBRARY_BASE)
-M4 = m4 -P --define=m4_artools_pkg_version=$V
+library_pkg: $(LIBRARY_PKG)
-CHMODAW = chmod a-w
+library_iso: $(LIBRARY_ISO)
-CHMODX = chmod +x
 
-BIN = $(BASE_BIN) $(PKG_BIN) $(ISO_BIN)
+edit = sed -e "s|@datadir[@]|$(DATADIR)|g" \
-
-all: $(BIN)
-
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
 	-e "s|@libdir[@]|$(LIBDIR)|g" \
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g"
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
+	-e "s|@buildtool[@]|$(TOOLS)|g" \
+	-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g" \
+	-e "s|@chrootver[@]|$(CHROOTVER)|g"
 
-%: %.in Makefile
+GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
-	@echo "GEN $@"
+
-	@$(RM) "$@"
+RM = rm -f
-	@$(M4) $@.in | $(EDIT) >$@
+
-	@$(CHMODAW) "$@"
+define buildInScript
-	@$(CHMODX) "$@"
+$(1)/%: $(2)%$(3)
-	@bash -O extglob -n "$@"
+	$$(GEN_MSG)
+	@mkdir -p $$(dir $$@)
+	@$(RM) "$$@"
+	@cat $$< | $(edit) >$$@
+	@chmod $(4) "$$@"
+	@bash -O extglob -n "$$@"
+endef
+
+$(eval $(call buildInScript,build/bin,src/base/,.in,755))
+$(eval $(call buildInScript,build/bin,src/pkg/,.in,755))
+$(eval $(call buildInScript,build/bin,src/iso/,.in,755))
+$(eval $(call buildInScript,build/lib,src/lib/,,644))
+
+conf_base:
+	@install -d $(BUILDDIR)/pacman.conf.d $(BUILDDIR)/artools
+	@cp -a $(PACMAN_CONFIGS) $(BUILDDIR)/pacman.conf.d
+	@cp -a $(TOOLS_CONFIGS_BASE) $(BUILDDIR)/artools
+
+conf_pkg:
+	@install -d $(BUILDDIR)/makepkg.conf.d $(BUILDDIR)/artools
+	@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
+	@cp -a $(TOOLS_CONFIGS_PKG) $(BUILDDIR)/artools
+
+conf_iso:
+	@install -d $(BUILDDIR)/artools
+	@cp -a $(TOOLS_CONFIGS_ISO) $(BUILDDIR)/artools
 
 clean:
-	$(RM) $(BIN)
+	rm -rf $(BUILDDIR)
 
-install_base:
+install_base: binprogs_base
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install -dm0755 $(DESTDIR)$(DATADIR)/pacman.conf.d
+	install -m0755 $(BINPROGS_BASE) $(DESTDIR)$(PREFIX)/bin
+	install -dm0755 $(DESTDIR)$(LIBDIR)
+	cp -ra $(BUILDDIR)/lib/base $(DESTDIR)$(LIBDIR)
 
-	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+	for conf in $(notdir $(TOOLS_CONFIGS_BASE)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
-	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
+	for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
-	install $(FILEMODE) $(BASE_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/base
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/pacman.conf.d
+install_pkg: binprogs_pkg
-	install $(FILEMODE) $(PACMAN_CONF) $(DESTDIR)$(DATADIR)/$(TOOLS)/pacman.conf.d
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install -dm0755 $(DESTDIR)$(DATADIR)/setarch-aliases.d
+	install -dm0755 $(DESTDIR)$(DATADIR)/makepkg.conf.d
+	install -m0755 $(BINPROGS_PKG) $(DESTDIR)$(PREFIX)/bin
+	install -dm0755 $(DESTDIR)$(LIBDIR)
+	cp -ra $(BUILDDIR)/lib/pkg $(DESTDIR)$(LIBDIR)
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d
+	for conf in $(notdir $(TOOLS_CONFIGS_PKG)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
-	for a in ${SETARCH_ALIASES}; do install $(FILEMODE) setarch-aliases.d/$$a $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d; done
 
-install_pkg:
+	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	for a in $(SETARCH_ALIASES); do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done
-	install $(FILEMODE) $(PKG_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	for l in $(LN_BUILDPKG); do ln -sf buildpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
+	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 
-	install $(DIRMODE) $(DESTDIR)$(BINDIR)
+install_iso: binprogs_iso
-	install $(MODE) $(PKG_BIN) $(DESTDIR)$(BINDIR)
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install -m0755 $(BINPROGS_ISO) $(DESTDIR)$(PREFIX)/bin
+	install -dm0755 $(DESTDIR)$(LIBDIR)
+	cp -ra $(BUILDDIR)/lib/iso $(DESTDIR)$(LIBDIR)
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
+	for conf in $(notdir $(TOOLS_CONFIGS_ISO)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
-	install $(FILEMODE) $(PKG_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/api
+	for l in $(LN_BUILDISO); do ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/$$l; done
-	install $(FILEMODE) $(PKG_LIB_API) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/api
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/ci
+install: all install_base install_pkg install_iso
-	install $(FILEMODE) $(PKG_LIB_CI) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/ci
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/git
+uninstall:
-	install $(FILEMODE) $(PKG_LIB_GIT) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/git
+	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+	for f in $(notdir $(LIBRARY)); do rm -f $(DESTDIR)$(DATADIR)/lib/$$f; done
+	rm -rf $(DESTDIR)$(DATADIR)/lib
+	for conf in $(notdir $(TOOLS_CONFIGS)); do rm -f $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
+	for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
+	for conf in $(notdir $(PACMAN_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
+	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(DATADIR)/setarch-aliases.d/$$f; done
+	for l in $(LN_BUILDPKG); do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
+	for l in $(LN_BUILDISO); do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
+	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
+	rmdir --ignore-fail-on-non-empty \
+		$(DESTDIR)$(DATADIR)/setarch-aliases.d \
+		$(DESTDIR)$(DATADIR)/makepkg.conf.d \
+		$(DESTDIR)$(DATADIR)/pacman.conf.d \
+		$(DESTDIR)$(DATADIR) \
+		$(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/repo
+dist:
-	install $(FILEMODE) $(PKG_LIB_REPO) $(DESTDIR)$(LIBDIR)/$(TOOLS)/pkg/repo
+	git archive --format=tar --prefix=$(TOOLS)-$(V)/ v$(V) | gzip > $(TOOLS)-$(V).tar.gz
+	gpg --detach-sign --use-agent $(TOOLS)-$(V).tar.gz
 
-	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
+check: $(BINPROGS_SRC_BASE) $(BINPROGS_SRC_PKG) $(BINPROGS_SRC_ISO) config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
+	shellcheck -x $^
 
-	$(LN) links-add $(DESTDIR)$(BINDIR)/links-remove
+.PHONY: all binprogs_base binprogs_pkg binprogs_iso library_base library_pkg library_iso conf_base conf_pkg conf_iso clean install install_base install_pkg install_iso uninstall dist check
-
+.DELETE_ON_ERROR:
-	for l in $(LN_BUILDPKG); do $(LN) buildpkg $(DESTDIR)$(BINDIR)/$$l; done
-
-# 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-# 	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
-
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/makepkg.conf.d
-	install $(FILEMODE) $(MAKEPKG_CONF) $(DESTDIR)$(DATADIR)/$(TOOLS)/makepkg.conf.d
-
-install_iso:
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(ISO_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-
-	install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
-	install $(FILEMODE) $(ISO_LIB) $(DESTDIR)$(LIBDIR)/$(TOOLS)/iso
-
-	install $(DIRMODE) $(DESTDIR)$(BINDIR)
-	install $(MODE) $(ISO_BIN) $(DESTDIR)$(BINDIR)
-
-	for l in $(LN_BUILDISO); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
-
-install: install_base install_pkg install_iso
-
-.PHONY: all clean install install_base install_pkg install_iso

README.md

@@ -12,25 +12,40 @@ artools
 ##### Buildtime:
 
 * make
-* git
+* shellcheck
-* m4
 
 ##### Runtime:
 
 - base:
-  * os-prober
+  * awk
+  * bash
+  * coreutils
+  * grep
   * pacman
+  * util-linux
+  * sed
 
 - pkg:
-  * namcap
+  * artools-base
-  * jq
+  * binutils
+  * diffutils
+  * findutils
+  * go-yq
+  * openssh
   * parallel
+  * rsync
 
 - iso:
+  * artools-base
   * dosfstools
-  * libisoburn
+  * e2fsprogs
-  * squashfs-tools
+  * findutils
   * grub
+  * libarchive
+  * libisoburn
+  * mtools
+  * squashfs-tools
+
 
 #### Configuration
 

bin/pkg/checkrepo.in

@@ -1,335 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
-
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
-
-source "${LIBDIR}"/base/util.sh
-source "${LIBDIR}"/pkg/util.sh
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/pkg/table.sh
-
-#{{{ db libs
-
-# shopt -s extglob
-
-# load_valid_names(){
-#     local conf
-#     conf="${DATADIR}"/valid-names.conf
-#     [[ -f "$conf" ]] || return 1
-#     # shellcheck source=/usr/share/artools/valid-names.conf
-#     [[ -r "$conf" ]] && . "$conf"
-#     return 0
-# }
-
-# tree_loop(){
-#     local func="$1" pkgs
-#     for tree in "${ARTIX_TREE[@]}"; do
-#         mapfile -t pkgs < <(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
-#         for p in "${pkgs[@]}"; do
-#             "$func" "$p"
-#         done
-#     done
-# }
-#
-# show_db_table(){
-#     msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
-#     tree_loop check_db
-# }
-
-#{{{ check db
-
-# is_db_entry() {
-#     local pkgname="$1" repo="${REPOS[$2]}" entry
-#     entry=${db_cache_dir}/linksdb/$repo/$pkgname
-#
-#     if [[ -d "$entry" ]];then
-#         return 0
-#     fi
-#     return 1
-# }
-#
-# check_db(){
-#     local pkgpath="${1}"
-#
-#     for repo in "${!REPOS[@]}"; do
-#
-#         local pkgbuild artixver
-#         if [[ -f $pkgpath/$repo/PKGBUILD ]]; then
-#             pkgbuild=$pkgpath/$repo/PKGBUILD
-#
-#             # shellcheck disable=1090
-#             . "$pkgbuild" 2>/dev/null
-#             artixver=$(get_full_version)
-#             for name in "${pkgname[@]}"; do
-#                 if ! is_db_entry "$name-$artixver" "$repo"; then
-#                     msg_row_red "${tableU}" "$repo" "$name" "$artixver" "false"
-#                 else
-#                     ${all_db} && msg_row "${tableU}" "$repo" "$name" "$artixver" "true"
-#                 fi
-#             done
-#             unset artixver pkgbuild pkgver epoch pkgname pkgbase
-#         fi
-#     done
-# }
-
-#}}}
-
-# {{{ check obsolete
-
-# show_obsolete_table() {
-#     local arch_mirror='https://mirror.f4st.host/archlinux'
-#
-#     local arch_repo artix_repo artix_db arch_db url
-#     arch_repo="${searchrepos[@]}"
-#     artix_repo="${REPOS[$arch_repo]}"
-#
-#     artix_db="${db_cache_dir}/artixdb/${artix_repo}"
-#     arch_db="${db_cache_dir}/archdb/${arch_repo}"
-#
-#     msg "Updating database cache ..."
-#     url=${REPOS_MIRROR}/${artix_repo}/os/$CARCH/${artix_repo}.${db_ext}
-#     extract_db "$url" "${artix_db}"
-#
-#     url=${arch_mirror}/${arch_repo}/os/$CARCH/${arch_repo}.${db_ext}
-#     extract_db "$url" "${arch_db}"
-#     msg "Done"
-#
-#     msg_table_header "${tableQ}" "Repo" "Package" "Obsolete"
-#     for p in "${artix_db}"/*; do
-#         local pkg rel
-#         pkg=${p##*/}
-#         rel=${pkg##*-}
-#         rel=${rel%.*}
-#         pkg=${pkg%-*}
-#         local p="$pkg-$rel"
-#
-#         if [[ "$p" != *openrc* ]] && [[ "$p" != *runit* ]] \
-#         && [[ "$p" != *s6* ]] && [[ "$p" != *suite66* ]] \
-#         && [[ "$p" != *udev* ]] && [[ "$p" != *elogind* ]] \
-#         && [[ "$p" != *sysusers* ]] && [[ "$p" != *tmpfiles* ]] \
-#         && [[ "$p" != *execline* ]] && [[ "$p" != *skalibs* ]] \
-#         && [[ "$p" != *netifrc* ]] && [[ "$p" != *bootlogd* ]] \
-#         && [[ "$p" != *pam_rundir* ]] && [[ "$p" != *artools* ]] \
-#         && [[ "$p" != *archlinux* ]] && [[ "$p" != *iso-profiles* ]] \
-#         && [[ "$p" != *calamares* ]] && [[ "$p" != *iso-initcpio* ]] \
-#         && [[ "$p" != *dinit* ]] && [[ "$p" != *artix* ]] && [[ "$p" != *blocaled* ]]; then
-#             if [[ ! -d "${arch_db}/$p" ]]; then
-#                 msg_row "${tableQ}" "${artix_repo}" "$p" "true"
-#             fi
-#         fi
-#     done
-# }
-
-#}}}
-
-extract_db() {
-    local u="$1" cdir="$2"
-    rm -rf "$cdir"
-    mkdir -p "$cdir"
-    msg2 "%s" "${cdir##*/}"
-    curl -L -s "$u" | bsdtar -xf - -C "$cdir"
-}
-
-update_linksdb_cache(){
-    msg "Updating database cache ..."
-    local cachedir url
-    for repo in "${ARTIX_REPOS[@]}"; do
-        cachedir=${db_cache_dir}/linksdb/$repo
-        url=${REPOS_MIRROR}/$repo/os/${CARCH}/$repo.${linksdb_ext}
-        extract_db "$url" "$cachedir"
-    done
-    msg "Done"
-}
-
-#}}}
-
-#{{{ sogrep
-
-query_db() {
-    if ${sync}; then
-        update_linksdb_cache
-    fi
-    for repo in "${ARTIX_REPOS[@]}"; do
-        local db
-        db=${db_cache_dir}/linksdb/$repo/
-        if [[ -d ${db} ]]; then
-            while read -rd '' pkg; do
-                read -r match
-                pkg=${pkg#${db}}
-                pkg="${pkg%/*}"
-                msg_row "${tableQ}" "$repo" "$pkg" "${match}"
-            done < <(grep -rZ "$library" "$db") | sort -u
-        fi
-    done
-}
-
-#}}}
-
-update_db_cache() {
-    local arch_mirror='https://mirror.netcologne.de/archlinux'
-
-    for repo in ${searchrepos[@]}; do
-        local arch_repo
-        local artix_db
-        local arch_db
-        local artix_url
-        local arch_url
-        arch_repo=${REPOS[${repo}]}
-        artix_db=${db_cache_dir}/artixdb/${repo}
-        arch_db=${db_cache_dir}/archdb/${arch_repo}
-        artix_url=${REPOS_MIRROR}/${repo}/os/$CARCH/${repo}.${db_ext}
-        arch_url=${arch_mirror}/${arch_repo}/os/$CARCH/${arch_repo}.${db_ext}
-
-        msg "Updating database cache ..."
-        extract_db "${artix_url}" "${artix_db}"
-        extract_db "${arch_url}" "${arch_db}"
-        msg "Done"
-    done
-}
-
-show_updates() {
-    if ${sync}; then
-        update_db_cache
-    fi
-
-    for repo in ${searchrepos[@]}; do
-        local arch_repo
-        local artix_db
-        local arch_db
-        arch_repo=${REPOS[${repo}]}
-        artix_db=${db_cache_dir}/artixdb/${repo}
-        arch_db=${db_cache_dir}/archdb/${arch_repo}
-
-        diff -ur $artix_db/ $arch_db/ | grep -A2 '%NAME%\|%VERSION%'
-    done
-}
-
-show_lib_table() {
-    msg_table_header "${tableQ}" "Repo" "Package" "Library"
-    query_db
-}
-
-db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
-
-linksdb_ext="links.tar.${DBEXT}"
-db_ext="db.tar.${DBEXT}"
-
-load_makepkg_config
-
-sync=false
-# check=false
-query=false
-updates=false
-
-# readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-55s %s"
-
-#{{{ repo names arrays
-
-searchrepos=(
-    system #0
-    world #1
-#     galaxy #2
-    lib32 #3
-    system-gremlins #4
-    world-gremlins #5
-#     galaxy-gremlins #6
-    lib32-gremlins #7
-    system-goblins #8
-    world-goblins #9
-#     galaxy-goblins #10
-    lib32-goblins #11
-#     system-rebuild #12
-#     world-rebuild #13
-#     gnome-wobble #14
-#     kde-wobble #15
-)
-
-ARTIX_REPOS=(
-    system #0
-    world #1
-    galaxy #2
-    lib32 #3
-    system-gremlins #4
-    world-gremlins #5
-    galaxy-gremlins #6
-    lib32-gremlins #7
-    system-goblins #8
-    world-goblins #9
-    galaxy-goblins #10
-    lib32-goblins #11
-#     system-rebuild #12
-#     world-rebuild #13
-    gnome-wobble #14
-    kde-wobble #15
-)
-
-declare -A REPOS=(
-    [${searchrepos[0]}]=core
-    [${searchrepos[1]}]=extra
-#     [${searchrepos[2]}]=galaxy
-    [${searchrepos[2]}]=multilib
-    [${searchrepos[3]}]=core-testing
-    [${searchrepos[4]}]=extra-testing
-#     [${searchrepos[6]}]=galaxy-testing
-    [${searchrepos[5]}]=multilib-testing
-    [${searchrepos[6]}]=core-staging
-    [${searchrepos[7]}]=extra-staging
-#     [${searchrepos[10]}]=galaxy-staging
-    [${searchrepos[8]}]=multilib-staging
-#     [${searchrepos[14]}]=gnome-unstable
-#     [${searchrepos[15]}]=kde-unstable
-)
-
-#}}}
-
-usage() {
-    printf "Usage: ${0##*/} [options] [query library]\n"
-    printf "    -s            Sync repo databases\n"
-#     printf '    -c            Check repos\n'
-    printf "    -q            Query repo databases for so libs\n"
-    printf "    -u            Show updates\n"
-    printf '    -h            This help\n'
-    printf '\n'
-    printf '\n'
-    exit "$1"
-}
-#
-opts='squh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        s) sync=true ;;
-#         c) check=true ;;
-        q) query=true ;;
-        u) updates=true ;;
-        h|?) usage 0 ;;
-    esac
-done
-#
-shift $(( OPTIND - 1 ))
-#
-library="$1"; shift
-
-# ${check} && show_db_table
-
-if ${query}; then
-    show_lib_table
-fi
-
-if ${updates}; then
-    show_updates
-fi

bin/pkg/links-add.in

@@ -1,514 +0,0 @@
-#!/bin/bash
-#
-#   links-add - add a package to a given repo database file
-#   links-remove - remove a package entry from a given repo database file
-#
-#   Copyright (c) 2006-2018 Pacman Development Team <pacman-dev@archlinux.org>
-#   Copyright (c) 2019 artoo@artixlinux.org
-#
-#   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 2 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 <http://www.gnu.org/licenses/>.
-
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-
-shopt -s extglob
-
-declare -r REPO_DB_NAME="links"
-
-QUIET=0
-ONLYADDNEW=0
-SIGN=0
-KEY=0
-VERIFY=0
-REPO_DB_FILE=
-REPO_DB_PREFIX=
-REPO_DB_SUFFIX=
-LOCKFILE=
-CLEAN_LOCK=0
-
-# ensure we have a sane umask set
-umask 0022
-
-# print usage instructions
-usage() {
-    cmd=${0##*/}
-    printf -- "%s \n\n" "$cmd"
-    if [[ $cmd == "links-add" ]] ; then
-        printf -- "Usage: links-add [options] <path-to-db> <package> ...\n"
-        printf -- "\n"
-        printf -- "\
-links-add will update a package database by reading a package file.\n\
-Multiple packages to add can be specified on the command line.\n"
-        printf -- "\n"
-        printf -- "Options:\n"
-        printf -- "  -n, --new         only add packages that are not already in the database\n"
-    elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Usage: links-remove [options] <path-to-db> <packagename> ...\n"
-        printf -- "\n"
-        printf -- "\
-links-remove will update a package database by removing the package name\n\
-specified on the command line from the given repo database. Multiple\n\
-packages to remove can be specified on the command line.\n"
-        printf -- "\n"
-        printf -- "Options:\n"
-    else
-        printf -- "Please move along, there is nothing to see here.\n"
-        return
-    fi
-    printf -- "  --nocolor         turn off color in output\n"
-    printf -- "  -q, --quiet       minimize output\n"
-    printf -- "  -s, --sign        sign database with GnuPG after update\n"
-    printf -- "  -k, --key <key>   use the specified key to sign the database\n"
-    printf -- "  -v, --verify      verify database's signature before update\n"
-    printf -- "\n\
-See %s(8) for more details and descriptions of the available options.\n" "$cmd"
-    printf "\n"
-    if [[ $cmd == "links-add" ]] ; then
-        printf -- "Example:  links-add /path/to/repo.links.tar.xz pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
-    elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Example:  links-remove /path/to/repo.links.tar.xz kernel26\n"
-    fi
-}
-
-find_pkgentry() {
-    local pkgname=$1
-    local pkgentry
-
-    for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
-        name=${pkgentry##*/}
-        if [[ ${name%-*-*} = "$pkgname" ]]; then
-            printf "%s\n" "$pkgentry"
-            return 0
-        fi
-    done
-    return 1
-}
-
-check_gpg() {
-    if ! type -p gpg >/dev/null; then
-        error "Cannot find the gpg binary! Is GnuPG installed?"
-        exit 1 # $E_MISSING_PROGRAM
-    fi
-
-    if (( ! VERIFY )); then
-        if ! gpg --list-secret-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then
-            if [[ -n "$GPGKEY" ]]; then
-                error "The key ${GPGKEY} does not exist in your keyring."
-            elif (( ! KEY )); then
-                error "There is no key in your keyring."
-            fi
-            exit 1
-        fi
-    fi
-}
-
-# sign the package database once repackaged
-create_signature() {
-    (( ! SIGN )) && return
-    local dbfile=$1
-    local ret=0
-    msg "Signing database '%s'..." "${dbfile##*/.tmp.}"
-
-    local SIGNWITHKEY=()
-    if [[ -n $GPGKEY ]]; then
-        SIGNWITHKEY=(-u "${GPGKEY}")
-    fi
-    gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "$dbfile" &>/dev/null || ret=$?
-
-    if (( ! ret )); then
-        msg2 "Created signature file '%s'" "${dbfile##*/.tmp.}.sig"
-    else
-        warning "Failed to sign package database file '%s'" "${dbfile##*/.tmp.}"
-    fi
-}
-
-# verify the existing package database signature
-verify_signature() {
-    (( ! VERIFY )) && return
-    local dbfile=$1
-    local ret=0
-    msg "Verifying database signature..."
-
-    if [[ ! -f $dbfile.sig ]]; then
-        warning "No existing signature found, skipping verification."
-        return
-    fi
-    gpg --verify "$dbfile.sig" || ret=$?
-    if (( ! ret )); then
-        msg2 "Database signature file verified."
-    else
-        error "Database signature was NOT valid!"
-        exit 1
-    fi
-}
-
-verify_repo_extension() {
-    local junk=()
-    if [[ $1 = *.links.tar* ]] && get_compression_command "$1" junk; then
-        return 0
-    fi
-
-    error "'%s' does not have a valid database archive extension." "$1"
-    exit 1
-}
-
-# write an entry to the pacman database
-#   arg1 - path to package
-db_write_entry() {
-    # blank out all variables
-    local pkgfile=$1
-
-    local pkgname pkgver
-
-    # read info from the zipped package
-    local line var val
-    while read -r line; do
-        [[ ${line:0:1} = '#' ]] && continue
-        IFS=' =' read -r var val < <(printf '%s\n' "$line")
-        # normalize whitespace with an extglob
-        declare "$var=${val//+([[:space:]])/ }"
-
-    done< <(bsdtar -xOqf "$pkgfile" .PKGINFO)
-
-    # ensure $pkgname and $pkgver variables were found
-    if [[ -z $pkgname || -z $pkgver ]]; then
-        error "Invalid package file '%s'." "$pkgfile"
-        return 1
-    fi
-
-    if [[ -d $tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver ]]; then
-        warning "An entry for '%s' already existed" "$pkgname-$pkgver"
-        if (( ONLYADDNEW )); then
-            return 0
-        fi
-    fi
-
-    # remove an existing entry if it exists, ignore failures
-    db_remove_entry "$pkgname"
-
-    local tmppkg=$tmpdir/pkg/$pkgname-$pkgver
-
-    mkdir "$tmppkg"
-
-    bsdtar -xof "$pkgfile" -C "$tmppkg" --include={opt,{,usr/}{lib{,32},{s,}bin}}'/*' 2>/dev/null
-
-    pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
-    mkdir "$pkgname-$pkgver"
-    pushd "$pkgname-$pkgver" >/dev/null
-
-    # create links entry
-    msg2 "Creating '%s' db entry..." "${REPO_DB_NAME}"
-
-    local linksentry=$tmpdir/${REPO_DB_NAME}/$pkgname-$pkgver/${REPO_DB_NAME}
-    local files=$(find "$tmppkg" -type f ! -ipath "*/Documentation/*")
-
-    for f in ${files}; do
-        readelf -d "$f" 2> /dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'
-    done | sort -u > "$linksentry"
-
-    popd >/dev/null
-    popd >/dev/null
-
-    return 0
-}
-
-# remove existing entries from the DB
-#   arg1 - package name
-db_remove_entry() {
-    local pkgname=$1
-    local notfound=1
-    local pkgentry
-    pkgentry=$(find_pkgentry "$pkgname")
-    while [[ -n $pkgentry ]]; do
-        notfound=0
-
-        msg2 "Removing existing entry '%s'..." \
-        "${pkgentry##*/}"
-        rm -rf "$pkgentry"
-
-        # remove entries in "links" database
-        local linksentry
-        linksentry=$(printf "%s\n" "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
-        rm -rf "$linksentry"
-
-        pkgentry=$(find_pkgentry "$pkgname")
-    done
-    return $notfound
-}
-
-prepare_repo_db() {
-    local repodir dbfile
-
-    # ensure the path to the DB exists; $LOCKFILE is always an absolute path
-    repodir=${LOCKFILE%/*}/
-
-    if [[ ! -d $repodir ]]; then
-        error "%s does not exist or is not a directory." "$repodir"
-        exit 1
-    fi
-
-    # check lock file
-    if ( set -o noclobber; printf "%s\n" "$$" > "$LOCKFILE") 2> /dev/null; then
-        CLEAN_LOCK=1
-    else
-        error "Failed to acquire lockfile: %s." "$LOCKFILE"
-        [[ -f $LOCKFILE ]] && error "Held by process %s" "$(cat "$LOCKFILE")"
-        exit 1
-    fi
-
-    dbfile=${repodir}/$REPO_DB_PREFIX.${REPO_DB_NAME}.$REPO_DB_SUFFIX
-
-    if [[ -f $dbfile ]]; then
-        # there are two situations we can have here:
-        # a DB with some entries, or a DB with no contents at all.
-        if ! bsdtar -tqf "$dbfile" '*/links' >/dev/null 2>&1; then
-            # check empty case
-            if [[ -n $(bsdtar -tqf "$dbfile" '*' 2>/dev/null) ]]; then
-                error "Repository file '%s' is not a proper links database." "$dbfile"
-                exit 1
-            fi
-        fi
-        verify_signature "$dbfile"
-        msg "Extracting %s to a temporary location..." "${dbfile##*/}"
-        bsdtar -xf "$dbfile" -C "$tmpdir/${REPO_DB_NAME}"
-    else
-        case $cmd in
-            links-remove)
-                # only a missing "db" database is currently an error
-                # TODO: remove if statement
-                if [[ ${REPO_DB_NAME} == "links" ]]; then
-                    error "Repository file '%s' was not found." "$dbfile"
-                    exit 1
-                fi
-                ;;
-            links-add)
-                # check if the file can be created (write permission, directory existence, etc)
-                if ! touch "$dbfile"; then
-                    error "Repository file '%s' could not be created." "$dbfile"
-                    exit 1
-                fi
-                rm -f "$dbfile"
-                ;;
-        esac
-    fi
-}
-
-add() {
-    if [[ ! -f $1 ]]; then
-        error "File '%s' not found." "$1"
-        return 1
-    fi
-
-    pkgfile=$1
-    if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then
-        error "'%s' is not a package file, skipping" "$pkgfile"
-        return 1
-    fi
-
-    msg "Adding package '%s'" "$pkgfile"
-
-    db_write_entry "$pkgfile"
-}
-
-remove() {
-    pkgname=$1
-    msg "Searching for package '%s'..." "$pkgname"
-
-    if ! db_remove_entry "$pkgname"; then
-        error "Package matching '%s' not found." "$pkgname"
-        return 1
-    fi
-
-    return 0
-}
-
-rotate_db() {
-    dirname=${LOCKFILE%/*}
-
-    pushd "$dirname" >/dev/null
-
-    filename=${REPO_DB_PREFIX}.${REPO_DB_NAME}.${REPO_DB_SUFFIX}
-    tempname=$dirname/.tmp.$filename
-
-    # hardlink or move the previous version of the database and signature to .old
-    # extension as a backup measure
-    if [[ -f $filename ]]; then
-        ln -f "$filename" "$filename.old" 2>/dev/null || \
-            mv -f "$filename" "$filename.old"
-
-        if [[ -f $filename.sig ]]; then
-            ln -f "$filename.sig" "$filename.old.sig" 2>/dev/null || \
-                mv -f "$filename.sig" "$filename.old.sig"
-        else
-            rm -f "$filename.old.sig"
-        fi
-    fi
-
-    # rotate the newly-created database and signature into place
-    mv "$tempname" "$filename"
-    if [[ -f $tempname.sig ]]; then
-        mv "$tempname.sig" "$filename.sig"
-    fi
-
-    dblink=${filename%.tar*}
-    rm -f "$dblink" "$dblink.sig"
-    ln -s "$filename" "$dblink" 2>/dev/null || \
-        ln "$filename" "$dblink" 2>/dev/null || \
-        cp "$filename" "$dblink"
-    if [[ -f "$filename.sig" ]]; then
-        ln -s "$filename.sig" "$dblink.sig" 2>/dev/null || \
-            ln "$filename.sig" "$dblink.sig" 2>/dev/null || \
-            cp "$filename.sig" "$dblink.sig"
-    fi
-
-    popd >/dev/null
-}
-
-create_db() {
-    # $LOCKFILE is already guaranteed to be absolute so this is safe
-    dirname=${LOCKFILE%/*}
-
-    filename=${REPO_DB_PREFIX}.${REPO_DB_NAME}.${REPO_DB_SUFFIX}
-    # this ensures we create it on the same filesystem, making moves atomic
-    tempname=$dirname/.tmp.$filename
-
-    pushd "$tmpdir/${REPO_DB_NAME}" >/dev/null
-    local files=(*)
-    if [[ ${files[*]} = '*' ]]; then
-        # we have no packages remaining? zip up some emptyness
-        warning "No packages remain, creating empty database."
-        files=(-T /dev/null)
-    fi
-    bsdtar -cf - "${files[@]}" | compress_as "$filename" > "$tempname"
-    popd >/dev/null
-
-    create_signature "$tempname"
-}
-
-trap_exit() {
-    # unhook all traps to avoid race conditions
-    trap '' EXIT TERM HUP QUIT INT ERR
-
-    printf '\n'
-    error "$@"
-    clean_up 1
-}
-
-clean_up() {
-    local exit_code=${1:-$?}
-
-    # unhook all traps to avoid race conditions
-    trap '' EXIT TERM HUP QUIT INT ERR
-
-    [[ -d $tmpdir ]] && rm -rf "$tmpdir"
-    (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
-
-    exit "$exit_code"
-}
-
-# PROGRAM START
-case $1 in
-    -h|--help) usage; exit 0;;
-esac
-
-# figure out what program we are
-cmd=${0##*/}
-
-if [[ $cmd != "links-add" && $cmd != "links-remove" ]]; then
-    error "Invalid command name '%s' specified." "$cmd"
-    exit 1
-fi
-
-tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/repo-tools.XXXXXXXXXX") || (\
-    error "Cannot create temp directory for database building."; \
-    exit 1)
-
-for repo in "pkg" "${REPO_DB_NAME}"; do
-    mkdir "$tmpdir/$repo"
-done
-
-trap 'clean_up' EXIT
-for signal in TERM HUP QUIT; do
-    trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal"
-done
-trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
-trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
-
-declare -a args
-# parse arguments
-while (( $# )); do
-    case $1 in
-        -q|--quiet) QUIET=1 ;;
-        -n|--new) ONLYADDNEW=1 ;;
-        -s|--sign) SIGN=1 ;;
-        -k|--key) KEY=1 ; shift; GPGKEY=$1 ;;
-        -v|--verify) VERIFY=1 ;;
-        *) args+=("$1") ;;
-    esac
-    shift
-done
-
-REPO_DB_FILE=${args[0]}
-if [[ -z $REPO_DB_FILE ]]; then
-    usage
-    exit 1
-fi
-
-if [[ $REPO_DB_FILE == /* ]]; then
-    LOCKFILE=$REPO_DB_FILE.lck
-else
-    LOCKFILE=$PWD/$REPO_DB_FILE.lck
-fi
-
-verify_repo_extension "$REPO_DB_FILE"
-
-REPO_DB_PREFIX=${REPO_DB_FILE##*/}
-REPO_DB_PREFIX=${REPO_DB_PREFIX%.links.*}
-REPO_DB_SUFFIX=${REPO_DB_FILE##*.links.}
-
-if (( SIGN || VERIFY )); then
-    check_gpg
-fi
-
-if (( VERIFY && ${#args[@]} == 1 )); then
-    dbfile=${repodir}/$REPO_DB_PREFIX.${REPO_DB_NAME}.$REPO_DB_SUFFIX
-
-    if [[ -f $dbfile ]]; then
-        verify_signature "$dbfile"
-    fi
-    exit 0
-fi
-
-prepare_repo_db
-
-fail=0
-for arg in "${args[@]:1}"; do
-    case $cmd in
-        links-add) add "$arg" ;;
-        links-remove) remove "$arg" ;;
-    esac || fail=1
-done
-
-# if the whole operation was a success, re-zip and rotate databases
-if (( !fail )); then
-    msg "Creating updated database file '%s'" "$REPO_DB_FILE"
-    create_db
-    rotate_db
-else
-    msg "No packages modified, nothing to do."
-    exit 1
-fi
-
-exit 0

bin/pkg/pkg2yaml.in

@@ -1,187 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
-
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
-
-source "${LIBDIR}"/base/message.sh
-source "${LIBDIR}"/base/yaml.sh
-
-#{{{ functions
-
-print_package_names() {
-    local version=$(get_full_version)
-    local architecture pkg
-    for pkg in ${pkgname[@]}; do
-        architecture=$(get_pkg_arch $pkg)
-        printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT"
-    done
-}
-
-print_debug_package_names() {
-    local version=$(get_full_version)
-    local architecture
-    if check_option "debug" "y" && check_option "strip" "y"; then
-        architecture=$(get_pkg_arch)
-        printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkgbase" "debug" "$version" "$architecture" "$PKGEXT"
-    fi
-}
-
-srcyaml_write_attr(){
-    local ident1="$1" ident2="$2" ident3="$3"
-    local attrname=$4 attrvalues=("${@:5}")
-
-    # normalize whitespace, strip leading and trailing
-    attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
-    attrvalues=("${attrvalues[@]#[[:space:]]}")
-    attrvalues=("${attrvalues[@]%[[:space:]]}")
-
-    case $attrname in
-        pkgver|pkgrel|epoch|url|install|changelog)
-            for v in "${attrvalues[@]}"; do
-                Yaml+=$(write_yaml_map "$ident3" "$attrname" "$v")
-            done
-        ;;
-        *)
-            Yaml+=$(write_yaml_map "$ident1" "$attrname")
-            for v in "${attrvalues[@]}"; do
-                Yaml+=$(write_yaml_seq "$ident2" "$v")
-            done
-        ;;
-    esac
-}
-
-pkgbuild_extract_to_yaml() {
-    local pkgname=$1 attrname=$2 isarray=$3 outvalue=
-
-    if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then
-        [[ -z $pkgname ]] && srcyaml_write_attr 2 4 2 "$attrname" "${outvalue[@]}"
-        [[ -n $pkgname ]] && srcyaml_write_attr 4 6 2 "$attrname" "${outvalue[@]}"
-    fi
-}
-
-srcyaml_write_section_details() {
-    local attr package_arch a
-    local multivalued_arch_attrs=(source provides conflicts depends replaces
-	                              optdepends makedepends checkdepends)
-# 	                              "${known_hash_algos[@]/%/sums}")
-
-    for attr in "${singlevalued[@]}"; do
-        pkgbuild_extract_to_yaml "$1" "$attr" 0
-    done
-
-    for attr in "${multivalued[@]}"; do
-        pkgbuild_extract_to_yaml "$1" "$attr" 1
-    done
-
-    get_pkgbuild_attribute "$1" 'arch' 1 'package_arch'
-    for a in "${package_arch[@]}"; do
-        # 'any' is special. there's no support for, e.g. depends_any.
-        [[ $a = any ]] && continue
-
-        for attr in "${multivalued_arch_attrs[@]}"; do
-            pkgbuild_extract_to_yaml "$1" "${attr}_$a" 1
-        done
-    done
-}
-
-yaml_write_global() {
-    local singlevalued=(pkgver pkgrel epoch url install changelog) #pkgdesc
-    local multivalued=(arch groups license checkdepends makedepends
-                    depends provides conflicts replaces)
-                    #noextract options backup optdepends
-                    #source validpgpkeys "${known_hash_algos[@]/%/sums}")
-
-    Yaml+=$(write_empty_line)
-    Yaml+=$(write_yaml_map 0 "pkgbase")
-    Yaml+=$(write_yaml_map 2 "name" "${pkgbase:-$pkgname}")
-    ${details} && srcyaml_write_section_details ''
-    Yaml+=$(write_empty_line)
-}
-
-yaml_write_package() {
-    local singlevalued=(url install changelog) #pkgdesc
-    local multivalued=(arch groups license checkdepends depends
-                    provides conflicts replaces) #options backup optdepends)
-
-    Yaml+=$(write_yaml_map 0 "packages")
-    for pkg in "${pkgname[@]}"; do
-        Yaml+=$(write_yaml_seq_map 2 "pkgname" "$pkg")
-        ${details} && srcyaml_write_section_details "$pkg"
-    done
-    Yaml+=$(write_empty_line)
-}
-
-yaml_write_fileinfo(){
-    local version
-    version=$(get_full_version)
-    pkgbase=${pkgbase:-$pkgname}
-    Yaml+=$(write_yaml_map 0 "version" "${version:-0}")
-    Yaml+=$(write_empty_line)
-    local pkgfile debug_pkg
-    pkgfile=$(print_package_names)
-    Yaml+=$(write_yaml_map 0 "files")
-    for f in ${pkgfile}; do
-        Yaml+=$(write_yaml_seq 2 "${f##*/}")
-    done
-    Yaml+=$(write_empty_line)
-    debug_pkg=$(print_debug_package_names)
-    Yaml+=$(write_yaml_map 0 "debug")
-    for d in ${debug_pkg}; do
-        Yaml+=$(write_yaml_seq 2 "${d##*/}")
-    done
-    Yaml+=$(write_empty_line)
-}
-
-write_srcyaml(){
-    Yaml=$(write_yaml_header)
-    yaml_write_global
-    yaml_write_package
-    yaml_write_fileinfo
-    printf '%s\n' "${Yaml}"
-}
-
-#}}}
-
-usage() {
-    printf 'Usage: %s [options]\n' "${0##*/}"
-    printf '    -d            Do not include details\n'
-    printf '    -h            This help\n'
-    printf '\n'
-    exit "$1"
-}
-
-details=true
-
-opts='dh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        d) details=false ;;
-        h|?) usage 0 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-srcpath=$(readlink -f "$1")
-
-[[ -f "$srcpath"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$srcpath"
-package="$srcpath"/PKGBUILD; shift
-
-# shellcheck disable=1090
-. "${package}"
-
-load_makepkg_config
-
-write_srcyaml

config/conf/artools-base.conf

@@ -1,3 +1,6 @@
+#!/hint/bash
+# shellcheck disable=2034
+
 #############################################
 ################ artools-base ###############
 #############################################

config/conf/artools-iso.conf

@@ -1,3 +1,6 @@
+#!/hint/bash
+# shellcheck disable=2034
+
 #############################################
 ################ artools-iso ################
 #############################################

config/conf/artools-pkg.conf

@@ -1,3 +1,6 @@
+#!/hint/bash
+# shellcheck disable=2034
+
 #############################################
 ################ artools-pkg ################
 #############################################
@@ -7,17 +10,11 @@
 
 # TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
 
-# customize buildtree
-# ARTIX_TREE=(
-#     main
-#     initsys
-#     desktop
-#     addons
-#     lib32
-# )
-
 # default repos root for deploypkg
 # REPOS_ROOT=${WORKSPACE_DIR}/repos
 
 # default mirror for checkrepo
 # REPOS_MIRROR="http://mirror1.artixlinux.org/repos"
+
+# default packaging org
+# GIT_ORG='packages'

config/setarch-aliases.d/x86_64_v3

@@ -0,0 +1 @@
+x86_64

contrib/makepkg/PKGBUILD.proto

@@ -0,0 +1,48 @@
+#!/hint/bash
+# shellcheck disable=2034
+
+# This is an example PKGBUILD file, so that shellcheck can know what
+# variables to expect be set after including a PKGBUILD.
+
+# Maintainer: Your Name <youremail@domain.com>
+pkgname=NAME
+pkgver=VERSION
+pkgrel=1
+epoch=
+pkgdesc=""
+arch=()
+url=""
+license=('GPL')
+groups=()
+depends=()
+makedepends=()
+checkdepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("$pkgname-$pkgver.tar.gz"
+        "$pkgname-$pkgver.patch")
+noextract=()
+md5sums=()
+validpgpkeys=()
+
+prepare() {
+	:
+}
+
+build() {
+	:
+}
+
+check() {
+	:
+}
+
+package() {
+	:
+}

data/pacman/gnome-wobble.conf

@@ -1,107 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[gnome-wobble]
-Include = /etc/pacman.d/mirrorlist
-
-[system-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[system-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[world-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

data/pacman/kde-wobble.conf

@@ -1,107 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[kde-wobble]
-Include = /etc/pacman.d/mirrorlist
-
-[system-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[system-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[world-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

lib/base/chroot-version.sh

@@ -1,3 +0,0 @@
-#!/hint/bash
-
-CHROOTVERSION=0.11

lib/pkg/ci/jenkins.sh

@@ -1,39 +0,0 @@
-#!/hint/bash
-
-#{{{ jenkins
-
-write_jenkinsfile(){
-    local jenkins=Jenkinsfile
-
-    printf "@Library('artix-ci') import org.artixlinux.RepoPackage\n" > "$jenkins"
-    {
-    printf '\n'
-    printf 'PackagePipeline(new RepoPackage(this))\n'
-    printf '\n'
-    } >> "$jenkins"
-
-    git add "$jenkins"
-}
-
-write_agentyaml(){
-    local agent=.artixlinux/agent.yaml label='master'
-    [[ -d .artixlinux ]] || mkdir .artixlinux
-
-    printf '%s\n' '---' > "$agent"
-    {
-    printf '\n'
-    printf "label: %s\n" "$label"
-    printf '\n'
-    } >> "$agent"
-
-    git add "$agent"
-}
-
-commit_ci(){
-    write_jenkinsfile
-    write_agentyaml
-
-    git commit -m "initial ci commit"
-}
-
-#}}}

lib/pkg/repo/add.sh

@@ -1,142 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_REPO_ADD_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_REPO_ADD_SH=1
-
-set -e
-
-get_commit_msg() {
-    printf "[%s] -> [%s] '%s' %s\n" "trunk" "${DEST}" "${pkgbase}-$(get_full_version)" "add"
-}
-
-artixpkg_repo_add_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
-
-    OPTIONS
-        -p, --push         Push pkgbase
-        -t, --topic        Set the [DEST_REPO] topic via gitea api
-        -h, --help         Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} extra-testing libfoo
-        $ ${COMMAND} -p extra-testing libfoo
-        $ ${COMMAND} -t -p extra-testing libfoo
-_EOF_
-}
-
-artixpkg_repo_add() {
-    if (( $# < 1 )); then
-        artixpkg_repo_add_usage
-        exit 0
-    fi
-
-    # options
-    local pkgbases=()
-    local pkgbase
-
-    local PUSH=0
-    local SET_TOPIC=0
-    local DEST='trunk'
-
-    # variables
-    local path
-
-    while (( $# )); do
-        case $1 in
-        -h|--help)
-            artixpkg_repo_add_usage
-            exit 0
-        ;;
-        -p|--push)
-            PUSH=1
-            shift
-        ;;
-        -t|--topic)
-            SET_TOPIC=1
-            shift
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            break
-        ;;
-        esac
-    done
-
-    DEST="$1"
-    pkgbases+=("$@")
-
-    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
-        die "${DEST} does not exist!"
-    fi
-
-    for pkgbase in "${pkgbases[@]}"; do
-
-        if [[ -d "${pkgbase}" ]];then
-
-            if [[ ! -d "${pkgbase}/.git" ]]; then
-                error "Not a Git repository: ${pkgbase}"
-                continue
-            fi
-            ( cd "${pkgbase}" || return
-
-                local pkgbuild
-
-                pkgbuild=trunk/PKGBUILD
-                if [[ ! -f "$pkgbuild" ]]; then
-                    die "No PKGBUILD found in (%s)" "trunk"
-                fi
-
-                [[ -d "$CARCH/${DEST}" ]] && git rm -r "$CARCH/${DEST}"
-                [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-                [[ ! -d "$CARCH/${DEST}" ]] && mkdir "$CARCH/${DEST}"
-
-                cp -r trunk/* "$CARCH/${DEST}"/
-
-                pkgbuild="$CARCH/${DEST}"/PKGBUILD
-
-                # shellcheck disable=1090
-                source "$pkgbuild"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg)
-
-                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
-
-                    msg 'Staging files'
-                    for f in $(git ls-files --modified -o --directory); do
-                        git add "$f"
-                    done
-#                     stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-#                     stat_done
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
-#                         stat_done
-                    fi
-
-                    if (( SET_TOPIC )); then
-                        # topics meta
-                        if [[ -n ${GIT_TOKEN} ]]; then
-                            local topic="${DEST}"
-                            local gitname=$(get_compliant_name "${pkgbase}")
-                            if ! add_topic "${gitname}" "${topic}" >/dev/null; then
-                                warning "failed to add pacman repo topic: ${topic}"
-                            fi
-                        fi
-                    fi
-                fi
-            )
-        fi
-
-    done
-}

lib/pkg/repo/move.sh

@@ -1,157 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_REPO_MOVE_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_REPO_MOVE_SH=1
-
-set -e
-
-
-artixpkg_repo_move_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [SOURCE_REPO] [DEST_REPO] [PKGBASE]...
-
-    OPTIONS
-        -p, --push         Push pkgbase
-        -t, --topic        Set the [DEST_REPO] topic via gitea api
-        -h, --help         Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} extra-testing extra libfoo
-        $ ${COMMAND} -p extra-testing extra libfoo
-        $ ${COMMAND} -t -p extra-testing extra libfoo
-_EOF_
-}
-
-get_commit_msg() {
-    printf "[%s] -> [%s] '%s' %s\n" "${SRC}" "${DEST}" "${pkgbase}-$(get_full_version)" "move"
-}
-
-artixpkg_repo_move() {
-    if (( $# < 1 )); then
-        artixpkg_repo_move_usage
-        exit 0
-    fi
-
-    # options
-    local pkgbases=()
-    local pkgbase
-
-    local PUSH=0
-    local SET_TOPIC=0
-
-    local DEST
-    local SRC
-
-    # variables
-    local path
-
-    while (( $# )); do
-        case $1 in
-        -h|--help)
-            artixpkg_repo_move_usage
-            exit 0
-        ;;
-        -p|--push)
-            PUSH=1
-            shift
-        ;;
-        -t|--topic)
-            SET_TOPIC=1
-            shift
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            break
-        ;;
-        esac
-    done
-
-   	SRC="$1"
-    DEST="$2"
-    shift 2
-
-    if ! in_array "${SRC}" "${ARTIX_DB[@]}"; then
-        die "${SRC} does not exist!"
-    fi
-    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
-        die "${DEST} does not exist!"
-    fi
-
-    pkgbases+=("$@")
-
-    for pkgbase in "${pkgbases[@]}"; do
-
-        if [[ -d "${pkgbase}" ]];then
-
-            if [[ ! -d "${pkgbase}/.git" ]]; then
-                error "Not a Git repository: ${pkgbase}"
-                continue
-            fi
-            ( cd "${pkgbase}" || return
-
-                pkgbuild=trunk/PKGBUILD
-                if [[ ! -f "$pkgbuild" ]]; then
-                    die "No PKGBUILD found in (%s)" "trunk"
-                fi
-
-                [[ -d "$CARCH/${DEST}" ]] && git rm -r "$CARCH/${DEST}"
-                [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-                [[ ! -d "$CARCH/${DEST}" ]] && mkdir "$CARCH/${DEST}"
-
-                mv -T "$CARCH/${SRC}" "$CARCH/${DEST}"
-
-                pkgbuild="$CARCH/${DEST}"/PKGBUILD
-
-                # shellcheck disable=1090
-                source "$pkgbuild"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg)
-
-                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
-
-#                     git add .
-                    msg 'Staging files'
-                    for f in $(git ls-files --deleted); do
-                        git rm "$f"
-                    done
-                    for f in $(git ls-files -o --unmerged); do
-                        git add "$f"
-                    done
-#                     stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-#                     stat_done
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
-#                         stat_done
-                    fi
-
-                    if (( SET_TOPIC )); then
-                        # topics meta
-                        if [[ -n ${GIT_TOKEN} ]]; then
-                            local topic="${DEST}"
-                            local gitname=$(get_compliant_name "${pkgbase}")
-                            if ! add_topic "${gitname}" "${topic}" >/dev/null; then
-                                warning "failed to add pacman repo topic: ${topic}"
-                            fi
-                            topic="${SRC}"
-                            if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
-                                warning "failed to remove pacman repo topic: ${topic}"
-                            fi
-                        fi
-                    fi
-                fi
-            )
-        fi
-
-    done
-}

lib/pkg/repo/remove.sh

@@ -1,137 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_REPO_REMOVE_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_REPO_REMOVE_SH=1
-
-set -e
-
-
-artixpkg_repo_remove_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
-
-    OPTIONS
-        -p, --push         Push pkgbase
-        -t, --topic        Set the [DEST_REPO] topic via gitea api
-        -h, --help         Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} extra-testing libfoo
-        $ ${COMMAND} -p extra-testing libfoo
-        $ ${COMMAND} -t -p extra-testing libfoo
-_EOF_
-}
-
-get_commit_msg() {
-    printf "[%s] '%s' %s\n" "${DEST}" "${pkgbase}-$(get_full_version)" "remove"
-}
-
-artixpkg_repo_remove() {
-    if (( $# < 1 )); then
-        artixpkg_repo_remove_usage
-        exit 0
-    fi
-
-    # options
-    local pkgbases=()
-    local pkgbase
-
-    local PUSH=0
-    local SET_TOPIC=0
-    local DEST='trunk'
-
-    # variables
-    local path
-
-    while (( $# )); do
-        case $1 in
-        -h|--help)
-            artixpkg_repo_remove_usage
-            exit 0
-        ;;
-        -p|--push)
-            PUSH=1
-            shift
-        ;;
-        -t|--topic)
-            SET_TOPIC=1
-            shift
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            pkgbases=("$@")
-            break
-        ;;
-        esac
-    done
-
-    DEST="$1"
-
-    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
-        die "${DEST} does not exist!"
-    fi
-
-    for pkgbase in "${pkgbases[@]}"; do
-
-        if [[ -d "${pkgbase}" ]];then
-
-            if [[ ! -d "${pkgbase}/.git" ]]; then
-                error "Not a Git repository: ${pkgbase}"
-                continue
-            fi
-            ( cd "${pkgbase}" || return
-
-                pkgbuild=trunk/PKGBUILD
-                if [[ ! -f "$pkgbuild" ]]; then
-                    die "No PKGBUILD found in (%s)" "trunk"
-                fi
-
-                pkgbuild="$CARCH/${DEST}"/PKGBUILD
-
-                # shellcheck disable=1090
-                source "$pkgbuild"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg)
-
-                rm -r "$CARCH/${DEST}"
-
-                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
-
-                    msg 'Staging files'
-                    for f in $(git ls-files --deleted); do
-                        git rm "$f"
-                    done
-#                     stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-#                     stat_done
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
-#                         stat_done
-                    fi
-
-                    if (( SET_TOPIC )); then
-                        # topics meta
-                        if [[ -n ${GIT_TOKEN} ]]; then
-                            local topic="${SRC}"
-                            if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
-                                warning "failed to remove pacman repo topic: ${topic}"
-                            fi
-                        fi
-                    fi
-
-                fi
-            )
-        fi
-
-    done
-}

src/base/artix-chroot.in

@@ -1,23 +1,16 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
 shopt -s extglob
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
+# shellcheck source=src/lib/base/mount.sh
 source "${LIBDIR}"/base/mount.sh
 
 usage() {
@@ -30,6 +23,8 @@ usage() {
     exit "$1"
 }
 
+orig_args=("$@")
+
 opts=':h'
 
 while getopts ${opts} arg; do
@@ -39,7 +34,7 @@ while getopts ${opts} arg; do
 done
 shift $(( OPTIND - 1 ))
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 chrootdir=$1
 shift

src/base/basestrap.in

@@ -1,16 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
 #
 # Assumptions:
@@ -22,10 +12,13 @@
 
 shopt -s extglob
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/mount.sh
 source "${LIBDIR}"/base/mount.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
 
 #{{{ functions
@@ -73,6 +66,8 @@ usage() {
     exit "$1"
 }
 
+orig_args=("$@")
+
 opts=':C:cGiMU'
 
 while getopts ${opts} arg; do
@@ -88,7 +83,7 @@ while getopts ${opts} arg; do
 done
 shift $(( OPTIND - 1 ))
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 (( $# )) || die "No root directory specified"
 newroot=$1; shift

src/base/chroot-run.in

@@ -1,31 +1,25 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/mount.sh
 source "${LIBDIR}"/base/mount.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
-source "${LIBDIR}"/base/chroot-version.sh
+
+CHROOTVERSION=@chrootver@
 
 # $1: chroot
 kill_chroot_process(){
     local prefix="$1" flink pid name
     for root_dir in /proc/*/root; do
         flink=$(readlink "$root_dir")
-        if [ "x$flink" != "x" ]; then
+        if [[ -n "$flink" ]]; then
-            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
+            if [[ "${flink:0:${#prefix}}" == "$prefix" ]]; then
                 # this process is in the chroot...
                 pid=$(basename "$(dirname "$root_dir")")
                 name=$(ps -p "$pid" -o comm=)
@@ -62,6 +56,8 @@ usage() {
     exit 1
 }
 
+orig_args=("$@")
+
 opts='hC:M:c:b:f:s'
 
 while getopts ${opts} arg; do
@@ -71,7 +67,7 @@ while getopts ${opts} arg; do
         c) cache_dirs+=("$OPTARG") ;;
         f) files+=("$OPTARG") ;;
         s) nosetarch=1 ;;
-        b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
+        b) bindmounts="$OPTARG"; mount_args+=(${bindmounts}) ;;
         h|?) usage ;;
     esac
 done
@@ -79,7 +75,7 @@ shift $(( OPTIND - 1 ))
 
 (( $# < 1 )) && die 'You must specify a directory.'
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 working_dir=$(readlink -f "$1")
 shift 1
@@ -91,7 +87,7 @@ if (( ${#cache_dirs[@]} == 0 )); then
 fi
 
 # shellcheck disable=2016
-host_mirrors=($(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
+mapfile -t host_mirrors < <(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#')
 
 for host_mirror in "${host_mirrors[@]}"; do
     if [[ $host_mirror == *file://* ]]; then
@@ -142,7 +138,10 @@ chroot_extra_mount() {
     chroot_add_resolv_conf "${working_dir}"
 
     for arg in "${mount_args[@]}"; do
-        local flag=${arg%%:*} dest=${arg##*:} src=${arg%:*}
+        local flag dest src
+        flag=${arg%%:*}
+        dest=${arg##*:}
+        src=${arg%:*}
         src=${src#*:}
         chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
     done
@@ -167,10 +166,10 @@ eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
 [[ -z $nosetarch ]] || unset CARCH
 
-if [[ -f "@datadir@/artools/setarch-aliases.d/${CARCH}" ]]; then
+if [[ -f "/usr/share/artools/artools/setarch-aliases.d/${CARCH}" ]]; then
-	read -r set_arch < "@datadir@/artools/setarch-aliases.d/${CARCH}"
+    read -r set_arch < "/usr/share/artools/artools/setarch-aliases.d/${CARCH}"
 else
-	set_arch="${CARCH}"
+    set_arch="${CARCH}"
 fi
 
 ${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "$@"

src/base/fstabgen.in

@@ -1,21 +1,12 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
 shopt -s extglob
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
 
 #{{{ filesystems
@@ -354,7 +345,7 @@ while read -r src target fstype opts fsroot; do
 
     src=$(unmangle "$src")
     target=$(unmangle "$target")
-    target=${target#$root}
+    target=${target#"$root"}
 
     if (( !foundroot )) && findmnt "$src" "$root" >/dev/null; then
         # this is root. we can't possibly have more than one...
@@ -419,7 +410,7 @@ done
         [[ $device = *'\040(deleted)' ]] && continue
 
         if [[ $type = file ]]; then
-            printf '%-20s' "${device#${root%/}}"
+            printf '%-20s' "${device#"${root%/}"}"
         elif [[ $device = /dev/dm-+([0-9]) ]]; then
             # device mapper doesn't allow characters we need to worry
             # about being mangled, and it does the escaping of dashes

src/base/mkchroot.in

@@ -1,22 +1,19 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
-source "${LIBDIR}"/base/chroot-version.sh
+
+CHROOTVERSION=@chrootver@
+
+# umask might have been changed in /etc/profile
+# ensure that sane default is set again
+umask 0022
 
 working_dir=''
 umode=''
@@ -37,6 +34,8 @@ usage() {
     exit 1
 }
 
+orig_args=("$@")
+
 opts='hUC:M:c:f:s'
 
 while getopts ${opts} arg; do
@@ -58,7 +57,7 @@ shift $(( OPTIND - 1 ))
 
 (( $# < 2 )) && die 'You must specify a directory and one or more packages.'
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 working_dir="$(readlink -f "$1")"
 shift 1
@@ -66,7 +65,7 @@ shift 1
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+    mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi
 
 umask 0022

src/iso/buildiso.in

@@ -1,37 +1,44 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
+DATADIR=${DATADIR:-'@datadir@'}
 SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
+# shellcheck source=src/lib/base/util.sh
 source "${LIBDIR}"/base/util.sh
+# shellcheck source=src/lib/iso/util.sh
 source "${LIBDIR}"/iso/util.sh
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
+# shellcheck source=src/lib/base/mount.sh
 source "${LIBDIR}"/iso/mount.sh
+# shellcheck source=src/lib/iso/services.sh
 source "${LIBDIR}"/iso/services.sh
+# shellcheck source=src/lib/base/yaml.sh
 source "${LIBDIR}"/base/yaml.sh
+# shellcheck source=src/lib/iso/calamares.sh
 source "${LIBDIR}"/iso/calamares.sh
+# shellcheck source=src/lib/iso/config.sh
 source "${LIBDIR}"/iso/config.sh
+# shellcheck source=src/lib/iso/firmware.sh
 source "${LIBDIR}"/iso/firmware.sh
+# shellcheck source=src/lib/iso/dracut.sh
 source "${LIBDIR}"/iso/dracut.sh
+# shellcheck source=src/lib/iso/initcpio.sh
 source "${LIBDIR}"/iso/initcpio.sh
+# shellcheck source=src/lib/iso/grub.sh
 source "${LIBDIR}"/iso/grub.sh
+# shellcheck source=src/lib/iso/squash.sh
 source "${LIBDIR}"/iso/squash.sh
+# shellcheck source=src/lib/iso/iso.sh
 source "${LIBDIR}"/iso/iso.sh
+# shellcheck source=src/lib/iso/profile.sh
 source "${LIBDIR}"/iso/profile.sh
+# shellcheck source=src/lib/iso/trap.sh
 source "${LIBDIR}"/iso/trap.sh
 
 clean_up_chroot(){
@@ -63,7 +70,7 @@ clean_up_chroot(){
         find "$path" -mindepth 1 -delete &> /dev/null
     fi
     # shellcheck disable=2035
-    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
+    find "$mnt" -name '*.pacnew' -name '*.pacsave' -name '*.pacorig' -delete
     if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
         rm "$mnt"/boot/grub/grub.cfg
     fi
@@ -191,8 +198,7 @@ prepare_build(){
     load_profile
 
     case "${repo}" in
-        'gremlins'|'goblins') repo="${repo}" ;;
+        buildiso) repo=default ;;
-        *) repo=default ;;
     esac
 
     pacman_conf="${DATADIR}/pacman.conf.d/${repo}.conf"
@@ -246,7 +252,7 @@ mk_iso(){
     [[ ! -d "${iso_root}" ]] && return 1
     if [[ -f "${iso_dir}/${iso_file}" ]]; then
         msg2 "Removing existing bootable image..."
-        rm -rf "${iso_dir}/${iso_file}"
+        rm -rf "${iso_dir:?}/${iso_file}"
     fi
     assemble_iso
     chown -R "${owner}:$(id --group "${owner}")" "${iso_dir}"
@@ -354,6 +360,8 @@ usage() {
     exit "$1"
 }
 
+orig_args=("$@")
+
 opts='p:r:t:i:g:czsbxmdqh'
 
 while getopts "${opts}" arg; do
@@ -381,7 +389,7 @@ prepare_build
 
 ${pretend} && display_settings && exit 1
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 prepare_dir "${mnt_dir}"
 prepare_dir "${iso_dir}"

src/lib/base/chroot.sh

@@ -1,21 +1,23 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ chroot
 
-orig_argv=("$0" "$@")
 check_root() {
-    local keepenv="$1"
+    local keepenv=$1
+    shift
+    local orig_argv=("$@")
 
     (( EUID == 0 )) && return
     if type -P sudo >/dev/null; then
-        # shellcheck disable=2154
+        exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
-        exec sudo --preserve-env="$keepenv" -- "${orig_argv[@]}"
     else
-        # shellcheck disable=2154
         exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
     fi
 }
 
+
 is_btrfs() {
     [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs ]]
 }

src/lib/base/message.sh

@@ -1,11 +1,15 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ message
 
 #set +u +o posix
 
+MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-/usr/share/makepkg}
+
 # shellcheck disable=1091
-. /usr/share/makepkg/util.sh
+source "${MAKEPKG_LIBRARY}"/util.sh
 
 export LANG=C
 

src/lib/base/mount.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ mount
 
@@ -53,8 +55,7 @@ chroot_mount_conditional() {
 }
 
 chroot_setup(){
-    local mnt="$1" os="$2" args='-t tmpfs -o nosuid,nodev,mode=0755'
+    local mnt="$1"
-    $os && args='--bind'
     chroot_mount_conditional "! mountpoint -q '$mnt'" "$mnt" "$mnt" --bind &&
     chroot_mount proc "$mnt/proc" -t proc -o nosuid,noexec,nodev &&
     chroot_mount sys "$mnt/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
@@ -63,14 +64,14 @@ chroot_setup(){
     chroot_mount udev "$mnt/dev" -t devtmpfs -o mode=0755,nosuid &&
     chroot_mount devpts "$mnt/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
     chroot_mount shm "$mnt/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_mount /run "$mnt/run" ${args} &&
+    chroot_mount /run "$mnt/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
     chroot_mount tmp "$mnt/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
 }
 
 chroot_api_mount() {
     CHROOT_ACTIVE_MOUNTS=()
     trap_setup chroot_api_umount
-    chroot_setup "$1" false
+    chroot_setup "$1"
 }
 
 chroot_api_umount() {

src/lib/base/util.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ base conf
 
@@ -23,8 +25,8 @@ load_base_config(){
 
     [[ -f "$conf" ]] || return 1
 
-    # shellcheck source=/etc/artools/artools-base.conf
+    # shellcheck source=config/conf/artools-base.conf
-    [[ -r "$conf" ]] && . "$conf"
+    [[ -r "$conf" ]] && source "$conf"
 
     CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
 

src/lib/base/yaml.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ yaml
 

src/lib/iso/calamares.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ calamares
 

src/lib/iso/config.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ session
 

src/lib/iso/dracut.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ dracut
 

src/lib/iso/firmware.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ firmware
 

src/lib/iso/grub.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ grub
 
@@ -7,7 +9,8 @@ prepare_grub(){
     local lib="$1"/usr/lib/grub
     local theme="$1"/usr/share/grub
     local livecfg="$2"/usr/share/grub
-    local grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot
+    local grub
+    grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot
 
     prepare_dir "${grub}/${platform}"
 

src/lib/iso/initcpio.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ initcpio
 

src/lib/iso/iso.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ iso
 

src/lib/iso/mount.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ mount
 

src/lib/iso/profile.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ profile
 
@@ -43,14 +45,15 @@ read_from_list() {
     local _space="s| ||g"
     local _clean=':a;N;$!ba;s/\n/ /g'
     local _com_rm="s|#.*||g"
-
     local _init="s|@initsys@|${INITSYS}|g"
+    local pkgs
 
-    msg2 "Loading Packages: [%s] ..." "${list##*/}"
+    mapfile -t pkgs < <(sed "$_com_rm" "$list" \
-    packages+=($(sed "$_com_rm" "$list" \
             | sed "$_space" \
             | sed "$_init" \
-            | sed "$_clean"))
+            | sed "$_clean")
+
+    printf "%s\n" "${pkgs[@]}"
 }
 
 read_from_services() {
@@ -72,14 +75,20 @@ load_pkgs(){
     packages=()
 
     if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
-        read_from_list "${common_dir}/Packages-base"
+        for l in base apps "${INITSYS}"; do
-        read_from_list "${common_dir}/Packages-apps"
+            msg2 "Loading Packages: [%s] ..." "Packages-${l}"
-        read_from_list "${common_dir}/Packages-${INITSYS}"
+            packages+=($(read_from_list "${common_dir}/Packages-${l}"))
-        [[ -n "${live_list}" ]] && read_from_list "${common_dir}/Packages-xorg"
+        done
-        read_from_list "$pkglist"
+        if [[ -n "${live_list}" ]]; then
+            msg2 "Loading Packages: [%s] ..." "Packages-xorg"
+            packages+=($(read_from_list "${common_dir}/Packages-xorg"))
+        fi
+        msg2 "Loading Packages: [%s] ..." "${pkglist##*/}"
+        packages+=($(read_from_list "${pkglist}"))
         read_from_services
     else
-        read_from_list "$pkglist"
+        msg2 "Loading Packages: [%s] ..." "${pkglist##*/}"
+        packages+=($(read_from_list "${pkglist}"))
     fi
 }
 

src/lib/iso/services.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ services
 

src/lib/iso/squash.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ squash
 

src/lib/iso/trap.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ trap
 

src/lib/iso/util.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ iso conf
 
@@ -8,8 +10,8 @@ load_iso_config(){
 
     [[ -f "$conf" ]] || return 1
 
-    # shellcheck source=/etc/artools/artools-iso.conf
+    # shellcheck source=config/conf/artools-iso.conf
-    [[ -r "$conf" ]] && . "$conf"
+    [[ -r "$conf" ]] && source "$conf"
 
     ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
 

src/lib/pkg/api/gitea.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ gitea api
 
@@ -44,7 +46,7 @@ add_team_to_repo() {
     local pkgbase="$1"
     local team="$2"
     local url
-    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/teams/$team"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/teams/$team"
 
     stat_busy "Adding team ($team) to package repo [$pkgbase]"
     api_put "$url" \
@@ -57,7 +59,7 @@ remove_team_from_repo() {
     local pkgbase="$1"
     local team="$2"
     local url
-    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/teams/$team"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/teams/$team"
 
     stat_busy "Removing team ($team) from package repo [$pkgbase]"
     api_delete "$url" \
@@ -69,10 +71,10 @@ remove_team_from_repo() {
 create_repo() {
     local pkgbase="$1"
     local url json
-    url="${GIT_URL}/api/v1/org/packages/repos"
+    url="${GIT_HTTPS}/api/v1/org/${GIT_ORG}/repos"
-    json="{ \"auto_init\": true, \"name\": \"$pkgbase\", \"gitignores\": \"ArchLinuxPackages\", \"readme\": \"Default\" }"
+    json="{ \"auto_init\": true, \"name\": \"$pkgbase\", \"gitignores\": \"ArtixLinuxPackages\", \"readme\": \"Default\" }"
 
-    stat_busy "Create package repo [$pkgbase] in org (packages)"
+    stat_busy "Create package repo [$pkgbase] in org (${GIT_ORG})"
     api_post "$url" \
         -H "accept: application/json" \
         -H "content-type: application/json" \
@@ -86,7 +88,7 @@ transfer_repo() {
     local new_owner="$2"
     local json url
     json="{ \"new_owner\": \"$new_owner\",  \"team_ids\": [] }"
-    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/transfer"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/transfer"
 
     stat_busy "Transfer package repo [$pkgbase] in org ($new_owner)"
     api_post "$url" \
@@ -99,7 +101,7 @@ transfer_repo() {
 
 list_all_repos() {
     local url
-    url="${GIT_URL}/api/v1/orgs/packages/repos?limit=10000"
+    url="${GIT_HTTPS}/api/v1/orgs/${GIT_ORG}/repos?limit=10000"
 
     api_get "$url" \
         -H "accept: application/json"
@@ -109,7 +111,7 @@ replace_topic() {
     local url
     local repo="$1"
     local maintainer="$2"
-    url="${GIT_URL}/api/v1/repos/packages/$repo/topics"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$repo/topics"
 
     api_put "$url" \
         -H "accept: application/json" \
@@ -125,7 +127,7 @@ replace_topic() {
 list_topics() {
     local url
     local pkgbase="$1"
-    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/topics"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics"
 
     api_get "$url" \
         -H "accept: application/json"
@@ -135,7 +137,7 @@ add_topic() {
     local url
     local pkgbase="$1"
     local topic="$2"
-    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/topics/$topic"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics/$topic"
 
     stat_busy "Add topic ($topic) to [$pkgbase]"
     api_put "$url" \
@@ -148,7 +150,7 @@ remove_topic() {
     local url
     local pkgbase="$1"
     local topic="$2"
-    url="${GIT_URL}/api/v1/repos/packages/$pkgbase/topics/$topic"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics/$topic"
 
     stat_busy "Remove topic ($topic) from [$pkgbase]"
     api_delete "$url" \
@@ -160,12 +162,11 @@ remove_topic() {
 search_topic() {
     local search="$1"
     local url
-    url="${GIT_URL}/api/v1/repos/search?q=${search}&topic=true&includeDesc=false&private=false&is_private=false&template=false&archived=false&order=asc"
+    url="${GIT_HTTPS}/api/v1/repos/search?q=${search}&topic=true&includeDesc=false&private=false&is_private=false&template=false&archived=false&order=asc&limit=10000"
 
     stat_busy "Query for topic (${search})"
     api_get "$url" \
         -H 'accept: application/json'
-
     stat_done
 }
 

src/lib/pkg/db/db.sh

@@ -0,0 +1,287 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+readonly ARTIX_DB=(
+    system-goblins
+    system-gremlins
+    system
+    world-goblins
+    world-gremlins
+    world
+    lib32-goblins
+    lib32-gremlins
+    lib32
+    galaxy-goblins
+    galaxy-gremlins
+    galaxy
+)
+
+readonly REPO_DB='.artixlinux/pkgbase.yaml'
+
+yaml_array() {
+    local array
+
+    for entry in "$@"; do
+        array="${array:-}${array:+,} ${entry}"
+    done
+    printf "%s\n" "[${array}]"
+}
+
+print_package_names() {
+    local version
+    local architecture pkg
+    version=$(get_full_version)
+    for pkg in "${pkgname[@]}"; do
+        architecture=$(get_pkg_arch "${pkg}")
+        printf "%s-%s-%s%s\n" "$pkg" "$version" "$architecture" "$PKGEXT"
+    done
+}
+
+print_debug_package_names() {
+    local version
+    local architecture
+    version=$(get_full_version)
+    if check_option "debug" "y" && check_option "strip" "y"; then
+        architecture=$(get_pkg_arch)
+        printf "%s-%s-%s-%s%s\n" "$pkgbase" "debug" "$version" "$architecture" "$PKGEXT"
+    fi
+}
+
+version_from_yaml() {
+    local dest="$1"
+    local version repo
+    repo=".repos.${dest}"
+    version=$(repo="${repo}" yq -r 'eval(strenv(repo)).version' "${REPO_DB}")
+    printf "%s\n" "${version}"
+}
+
+packages_from_yaml() {
+    local dest="$1"
+    local repo pkgs packages
+    repo=".repos.${dest}"
+    mapfile -t packages < <(repo="${repo}" yq -r 'eval(strenv(repo)).packages[]' "${REPO_DB}")
+    for p in "${packages[@]}"; do
+        pkgs="${pkgs:-}${pkgs:+,} ${p}"
+    done
+    printf "%s\n" "[${pkgs}]"
+}
+
+to_bool() {
+    local int="$1"
+    case "${int}" in
+        0) printf "false\n" ;;
+        1) printf "true\n" ;;
+    esac
+}
+
+get_commit_msg() {
+    local action="$1"
+    local dest="$2"
+    local src="$3"
+    local version
+
+    case "${action}" in
+        add|remove)
+            version=$(version_from_yaml "${dest}")
+            printf "[%s] '%s' %s\n" "${dest}" "${pkgbase}-${version}" "${action}"
+        ;;
+        move)
+            version=$(version_from_yaml "${src}")
+            printf "[%s] -> [%s] '%s' %s\n" "${src}" "${dest}" "${pkgbase}-${version}" "${action}"
+        ;;
+    esac
+}
+
+create_repo_db() {
+    [[ -d .artixlinux ]] || mkdir .artixlinux
+
+    yq -n '"---"' > "${REPO_DB}"
+
+    yq -P 'with(
+        .pkgbase;
+            .name = null |
+            .version = null |
+            .arch = [] |
+            .pkgname = [] )' \
+        -i "${REPO_DB}"
+
+    yq -P 'with(
+        .actions;
+            .addRepo = null |
+            .removeRepo = null |
+            .triggersBuild = false |
+            .triggersRebuild = false |
+            .triggersRepoAdd = false |
+            .triggersRepoRemove = false |
+            .triggersNoCheck = false )' \
+        -i "${REPO_DB}"
+
+    yq -P '.repos = {}' -i "${REPO_DB}"
+
+    for r in "${ARTIX_DB[@]}"; do
+        local repo
+        repo=".repos.${r}" \
+            yq -P 'with(
+                    eval(strenv(repo));
+                        .version = null |
+                        .packages = [] )' \
+                -i "${REPO_DB}"
+    done
+}
+
+update_yaml_base() {
+    local version
+    local name
+    local pkgnames
+    local arches
+
+    name="${pkgbase:-${pkgname}}"
+    version="$(get_full_version)"
+    pkgnames=$(yaml_array "${pkgname[@]}")
+    arches=$(yaml_array "${arch[@]}")
+
+    name="${name}" version="${version}" pkgnames="${pkgnames}" arches="${arches}" \
+        yq -P 'with(
+            .pkgbase;
+                .name = env(name) |
+                .version = env(version) |
+                .arch = env(arches) |
+                .pkgname = env(pkgnames) )' \
+            -i "${REPO_DB}"
+}
+
+update_yaml_add() {
+    local rebuild="$1"
+    local add="$2"
+    local nocheck="$3"
+    local dest="$4"
+
+    local build=true
+
+    rebuild=$(to_bool "${rebuild}")
+    if ${rebuild}; then
+        rebuild=true
+        build=false
+    fi
+
+    add=$(to_bool "${add}")
+    if ${add}; then
+        local repo
+        local pkgs
+        local version
+        local pkgfiles
+
+        mapfile -t pkgfiles < <(print_package_names)
+
+        pkgs=$(yaml_array "${pkgfiles[@]}")
+
+        version=$(get_full_version)
+        repo=".repos.${dest}"
+
+        version="${version}" pkgs="${pkgs}" repo="${repo}" \
+            yq -P 'with(
+                    eval(strenv(repo));
+                        .version = env(version) |
+                        .packages = env(pkgs) )' \
+                -i "${REPO_DB}"
+    fi
+
+    nocheck=$(to_bool "${nocheck}")
+
+    nocheck="${nocheck}" add="${add}" \
+    rebuild="${rebuild}" build="${build}" dest="${dest}" \
+        yq -P 'with(
+            .actions;
+                .addRepo = env(dest) |
+                .removeRepo = null |
+                .triggersBuild = env(build) |
+                .triggersRebuild = env(rebuild) |
+                .triggersRepoAdd = env(add) |
+                .triggersRepoRemove = false |
+                .triggersNoCheck = env(nocheck) )' \
+            -i "${REPO_DB}"
+}
+
+update_yaml_remove() {
+    local dest="$1"
+
+    local repo
+    repo=".repos.${dest}"
+
+    repo="${repo}" \
+        yq -P 'with(
+                eval(strenv(repo));
+                    .version = null |
+                    .packages = [] )' \
+            -i "${REPO_DB}"
+
+    dest="${dest}" \
+        yq -P 'with(
+            .actions;
+                .addRepo = null |
+                .removeRepo = env(dest) |
+                .triggersBuild = false |
+                .triggersRebuild = false |
+                .triggersRepoAdd = false |
+                .triggersRepoRemove = true |
+                .triggersNoCheck = false )' \
+            -i "${REPO_DB}"
+}
+
+update_yaml_move() {
+    local src="$1"
+    local dest="$2"
+    local pkgs
+    local version
+    local src_repo
+    local dest_repo
+
+    src_repo=".repos.${src}"
+    dest_repo=".repos.${dest}"
+
+    version=$(version_from_yaml "${src}")
+    pkgs=$(packages_from_yaml "${src}")
+
+    src_repo="${src_repo}" \
+        yq -P 'with(
+                eval(strenv(src_repo));
+                    .version = null |
+                    .packages = [] )' \
+            -i "${REPO_DB}"
+
+    version="${version}" pkgs="${pkgs}" dest_repo="${dest_repo}" \
+        yq -P 'with(
+                eval(strenv(dest_repo));
+                    .version = env(version) |
+                    .packages = env(pkgs) )' \
+            -i "${REPO_DB}"
+
+    src=${src} dest="${dest}" \
+        yq -P 'with(
+            .actions;
+                .addRepo = env(dest) |
+                .removeRepo = env(src) |
+                .triggersBuild = false |
+                .triggersRebuild = false |
+                .triggersRepoAdd = true |
+                .triggersRepoRemove = true |
+                .triggersNoCheck = false )' \
+            -i "${REPO_DB}"
+}
+
+show_db() {
+    if ! yq -r ${REPO_DB} 1>/dev/null 2>/dev/null; then
+        die "${REPO_DB} invalid!"
+    fi
+    yq -rP '. | .repos |= with_entries(select(.value.version))' "${REPO_DB}"
+    return 0
+}
+
+show_srcinfo_base() {
+    pkg2yaml . | yq '.pkgbase'
+}
+
+show_srcinfo_pkgs() {
+    pkg2yaml . | yq '.pkgnames'
+}

src/lib/pkg/db/migrate.sh

@@ -0,0 +1,79 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+declare -rA REPO_MAP=(
+    [core-rebuild]=system-goblins
+    [core-staging]=system-goblins
+    [core-testing]=system-gremlins
+    [core]=system
+    [extra-rebuild]=world-goblins
+    [extra-staging]=world-goblins
+    [extra-testing]=world-gremlins
+    [extra]=world
+    [multilib-staging]=lib32-goblins
+    [multilib-testing]=lib32-gremlins
+    [multilib]=lib32
+    [community-staging]=galaxy-goblins
+    [community-testing]=galaxy-gremlins
+    [community]=galaxy
+)
+
+update_gitignore() {
+    {
+    printf '*.service\n'
+    printf '*.timer\n'
+    printf '*.socket\n'
+    } >> .gitignore
+}
+
+migrate_to_yaml() {
+    if [[ -f trunk/PKGBUILD ]]; then
+        cp -r trunk/* ./
+        stat_busy "Migrating ${pkgbase} to new layout"
+        create_repo_db
+        stat_done
+        # shellcheck source=contrib/makepkg/PKGBUILD.proto
+        source "trunk/PKGBUILD"
+        update_yaml_base
+
+        if [[ -d x86_64 ]]; then
+            local repos
+            mapfile -t repos < <(ls x86_64)
+            for r in "${repos[@]}"; do
+                # shellcheck source=contrib/makepkg/PKGBUILD.proto
+                source "x86_64/${r}/PKGBUILD"
+
+                local repo
+                local pkgs
+                local version
+                local pkgfiles
+
+                mapfile -t pkgfiles < <(print_package_names)
+
+                pkgs=$(yaml_array "${pkgfiles[@]}")
+
+                version=$(get_full_version)
+
+                repo=".repos.${REPO_MAP[$r]}"
+
+                version="${version}" pkgs="${pkgs}" repo="${repo}" \
+                    yq -P 'with(
+                            eval(strenv(repo));
+                                .version = env(version) |
+                                .packages = env(pkgs) )' \
+                        -i "${REPO_DB}"
+            done
+            git rm -r x86_64
+        fi
+        git rm -r trunk
+        if [[ -f .artixlinux/agent.yaml ]]; then
+            git rm .artixlinux/agent.yaml
+        fi
+        if [[ -f .gitignore ]]; then
+            update_gitignore
+        fi
+        git add .
+        git commit -m "migrate to new layout"
+    fi
+}

src/lib/pkg/deploy.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ functions
 

src/lib/pkg/diff.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ functions
 

src/lib/pkg/git.sh

@@ -45,7 +45,7 @@ artixpkg_git() {
         clone)
             _ARTOOLS_COMMAND+=" $1"
             shift
-            # shellcheck source=lib/git/clone.sh
+            # shellcheck source=src/lib/pkg/git/clone.sh
             source "${LIBDIR}"/pkg/git/clone.sh
             artixpkg_git_clone "$@"
             exit 0
@@ -53,7 +53,7 @@ artixpkg_git() {
         config)
             _ARTOOLS_COMMAND+=" $1"
             shift
-            # shellcheck source=lib/git/config.sh
+            # shellcheck source=src/lib/pkg/git/config.sh
             source "${LIBDIR}"/pkg/git/config.sh
             artixpkg_git_config "$@"
             exit 0
@@ -61,11 +61,19 @@ artixpkg_git() {
         create)
             _ARTOOLS_COMMAND+=" $1"
             shift
-            # shellcheck source=lib/git/create.sh
+            # shellcheck source=src/lib/pkg/git/create.sh
             source "${LIBDIR}"/pkg/git/create.sh
             artixpkg_git_create "$@"
             exit 0
         ;;
+        pull)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/git/pull.sh
+            source "${LIBDIR}"/pkg/git/pull.sh
+            artixpkg_git_pull "$@"
+            exit 0
+        ;;
         -*)
             die "invalid argument: %s" "$1"
         ;;

src/lib/pkg/git/clone.sh

@@ -5,6 +5,7 @@
 [[ -z ${ARTOOLS_INCLUDE_GIT_CLONE_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_GIT_CLONE_SH=1
 
+# shellcheck source=src/lib/pkg/git/config.sh
 source "${LIBDIR}"/pkg/git/config.sh
 
 set -e
@@ -57,14 +58,14 @@ artixpkg_git_clone() {
                 exit 0
             ;;
             --protocol=https)
-                GIT_REPO_BASE_URL="${GIT_URL}/"
+                GIT_REPO_BASE_URL="${GIT_HTTPS}/"
                 CONFIGURE_OPTIONS+=("$1")
                 shift
             ;;
             --protocol)
                 (( $# <= 1 )) && die "missing argument for %s" "$1"
                 if [[ $2 == https ]]; then
-                    GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
+                    GIT_REPO_BASE_URL="${GIT_HTTPS}/"
                 else
                     die "unsupported protocol: %s" "$2"
                 fi
@@ -117,20 +118,20 @@ artixpkg_git_clone() {
         stat_busy "Query mantainer packages"
             local maint
             maint="maintainer-${MAINTAINER}"
-            mapfile -t pkgbases < <(search_topic "${maint}" | jq -r '.data | .[].name' | sort)
+            mapfile -t pkgbases < <(search_topic "${maint}" | yq -P -r '.data | .[].name' | sort)
         stat_done
     fi
 
     if [[ -n ${TOPIC} ]]; then
         stat_busy "Query topic packages"
-            mapfile -t pkgbases < <(search_topic "${TOPIC}" | jq -r '.data | .[].name' | sort)
+            mapfile -t pkgbases < <(search_topic "${TOPIC}" | yq -P -r '.data | .[].name' | sort)
         stat_done
     fi
 
     # Query all released packages
     if (( CLONE_ALL )); then
         stat_busy "Query all packages"
-            mapfile -t pkgbases < <(list_all_repos | jq -r '.[] | .name' | sort)
+            mapfile -t pkgbases < <(list_all_repos | yq -P -r '.[] | .name' | sort)
         stat_done
     fi
 
@@ -152,7 +153,7 @@ artixpkg_git_clone() {
             msg "Cloning ${pkgbase} ..."
             local gitname url
             gitname=$(get_compliant_name "${pkgbase}")
-            url="${GIT_REPO_BASE_URL}packages/${gitname}.git"
+            url="${GIT_REPO_BASE_URL}${GIT_ORG}/${gitname}.git"
             if ! git clone "${url}" "${pkgbase}"; then
                 die 'failed to clone %s' "${pkgbase}"
             fi

src/lib/pkg/git/config.sh

@@ -5,10 +5,27 @@
 [[ -z ${ARTOOLS_INCLUDE_GIT_CONFIG_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_GIT_CONFIG_SH=1
 
+# shellcheck source=src/lib/pkg/db/db.sh
+source "${LIBDIR}"/pkg/db/db.sh
+# shellcheck source=src/lib/pkg/db/migrate.sh
+source "${LIBDIR}"/pkg/db/migrate.sh
 
 set -e
 
 
+commit_ci(){
+    local ci=Jenkinsfile
+
+    printf "@Library('artix-ci') import org.artixlinux.RepoPackage\n" > "${ci}"
+    {
+    printf '\n'
+    printf 'PackagePipeline(new RepoPackage(this))\n'
+    } >> "${ci}"
+
+    git add "${ci}"
+    git commit -m "initial ci commit"
+}
+
 artixpkg_git_config_usage() {
     local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
     cat <<- _EOF_
@@ -78,7 +95,7 @@ is_packager_email_official() {
 
 artixpkg_git_config() {
     # options
-    local GIT_REPO_BASE_URL=${GIT_URL}
+    local GIT_REPO_BASE_URL=${GIT_HTTPS}
     local official=0
     local proto=https
     local proto_force=0
@@ -166,7 +183,7 @@ artixpkg_git_config() {
             official=1
             if (( ! proto_force )); then
                 proto=ssh
-                GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
+                GIT_REPO_BASE_URL="${GIT_SSH}/"
             fi
         fi
     fi
@@ -195,7 +212,7 @@ artixpkg_git_config() {
     for path in "${paths[@]}"; do
         if ! realpath=$(realpath -e "${path}"); then
             error "No such directory: ${path}"
-#             continue
+            continue
         fi
 
         pkgbase=$(basename "${realpath}")
@@ -204,7 +221,7 @@ artixpkg_git_config() {
 
         if [[ ! -d "${path}/.git" ]]; then
             error "Not a Git repository: ${path}"
-#             continue
+            continue
         fi
         ( cd "${path}" || return
             git config pull.rebase true
@@ -241,11 +258,37 @@ artixpkg_git_config() {
             fi
             if (( UPSTREAM )); then
                 local remote_url
-                remote_url="${GIT_UPSTREAM_URL}/$pkgbase".git
+                remote_url="${GIT_UPSTREAM_URL}/${pkgbase}".git
                 if ! git remote add upstream "${remote_url}"; then
                     warning "failed to set the upstream: ${remote_url}"
                 fi
             fi
+
+            migrate_to_yaml
+
+            if [[ ! -f Jenkinsfile ]]; then
+                msg "Adding ci support ..."
+                commit_ci
+            fi
+
+            if [[ ! -f ${REPO_DB} ]]; then
+
+                msg "Creating repo db ..."
+                create_repo_db
+
+                if [[ -f PKGBUILD ]]; then
+                    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+                    source PKGBUILD
+                    update_yaml_base
+                fi
+                git add "${REPO_DB}"
+                git commit -m "Create repo db"
+            fi
+
+            msg "Querying ${pkgbase} ..."
+            if ! show_db; then
+                warning "Could not query ${REPO_DB}"
+            fi
         )
     done
 }

src/lib/pkg/git/create.sh

@@ -5,9 +5,10 @@
 [[ -z ${ARTOOLS_INCLUDE_GIT_CREATE_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_GIT_CREATE_SH=1
 
+# shellcheck source=src/lib/pkg/git/clone.sh
 source "${LIBDIR}"/pkg/git/clone.sh
+# shellcheck source=src/lib/pkg/git/config.sh
 source "${LIBDIR}"/pkg/git/config.sh
-source "${LIBDIR}"/pkg/ci/jenkins.sh
 
 set -e
 
@@ -33,8 +34,9 @@ artixpkg_git_create() {
     local pkgbase
     local clone=0
     local config=0
-    local TEAM='extra'
+    local TEAM='world'
 
+    local TEAMS=(system world lib32)
     # variables
     local path
 
@@ -67,6 +69,10 @@ artixpkg_git_create() {
         esac
     done
 
+    if ! in_array "${TEAM}" "${TEAMS[@]}"; then
+        die "${TEAM} does not exist!"
+    fi
+
     # check if invoked without any path from within a packaging repo
     if (( ${#pkgbases[@]} == 0 )); then
         if [[ -f PKGBUILD ]]; then
@@ -84,7 +90,8 @@ artixpkg_git_create() {
 
     # create
     for pkgbase in "${pkgbases[@]}"; do
-        local gitname=$(get_compliant_name "${pkgbase}")
+        local gitname
+        gitname=$(get_compliant_name "${pkgbase}")
         if ! create_repo "${gitname}" >/dev/null; then
             die "failed to create project: ${pkgbase}"
         fi
@@ -94,9 +101,6 @@ artixpkg_git_create() {
         msg_success "Successfully created ${pkgbase}"
         if (( clone )); then
             artixpkg_git_clone "${pkgbase}"
-            ( cd "${pkgbase}"
-                commit_ci
-            )
         elif (( config )); then
             artixpkg_git_config
         fi

src/lib/pkg/git/pull.sh

@@ -0,0 +1,148 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_GIT_PULL_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_PULL_SH=1
+
+# shellcheck source=src/lib/pkg/git/config.sh
+source "${LIBDIR}"/pkg/git/config.sh
+
+set -e
+
+
+artixpkg_git_pull_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -m, --maintainer=NAME  Pull all packages of the named maintainer
+        -t, --topic=NAME       Pull all packages of the named topic
+        -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
+        --universe             Pull all existing packages
+        -h, --help             Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo linux libbar
+        $ ${COMMAND} --maintainer maintainer-mynickname
+        $ ${COMMAND} --topic myopic
+        $ ${COMMAND} -j 8 --topic myopic
+_EOF_
+}
+
+
+
+artixpkg_git_pull() {
+    if (( $# < 1 )); then
+        artixpkg_git_pull_usage
+        exit 0
+    fi
+
+    # options
+    local PULL_ALL=0
+    local MAINTAINER=
+    local TOPIC=
+    local CONFIGURE_OPTIONS=()
+    local jobs=
+    jobs=$(nproc)
+
+    local command=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_git_pull_usage
+                exit 0
+            ;;
+            -m|--maintainer)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                MAINTAINER="$2"
+                shift 2
+            ;;
+            --maintainer=*)
+                MAINTAINER="${1#*=}"
+                shift
+            ;;
+            -t|--topic)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                TOPIC="$2"
+                shift 2
+            ;;
+            --topic=*)
+                TOPIC="${1#*=}"
+                shift
+            ;;
+            --universe)
+                PULL_ALL=1
+                shift
+            ;;
+            -j|--jobs)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                jobs=$2
+                shift 2
+            ;;
+            --)
+                shift
+                break
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                pkgbases=("$@")
+                break
+            ;;
+        esac
+    done
+
+    # Query packages of a maintainer
+    if [[ -n ${MAINTAINER} ]]; then
+        stat_busy "Query mantainer packages"
+            local maint
+            maint="maintainer-${MAINTAINER}"
+            mapfile -t pkgbases < <(search_topic "${maint}" | yq -P -r '.data | .[].name' | sort)
+        stat_done
+    fi
+
+    if [[ -n ${TOPIC} ]]; then
+        stat_busy "Query topic packages"
+            mapfile -t pkgbases < <(search_topic "${TOPIC}" | yq -P -r '.data | .[].name' | sort)
+        stat_done
+    fi
+
+    # Query all released packages
+    if (( PULL_ALL )); then
+        stat_busy "Query all packages"
+            mapfile -t pkgbases < <(list_all_repos | yq -P -r '.[] | .name' | sort)
+        stat_done
+    fi
+
+    # parallelization
+    if [[ ${jobs} != 1 ]] && (( ${#pkgbases[@]} > 1 )); then
+        # force colors in parallel if parent process is colorized
+        if [[ -n ${BOLD} ]]; then
+            export ARTOOLS_COLOR=always
+        fi
+        if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${pkgbases[@]}"; then
+            die 'Failed to pull some packages, please check the output'
+            exit 1
+        fi
+        exit 0
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+        if [[ -d ${pkgbase} ]]; then
+            ( cd ${pkgbase} || return
+
+                msg "Pulling ${pkgbase} ..."
+                if ! git pull origin master; then
+                    die 'failed to pull %s' "${pkgbase}"
+                fi
+
+            )
+        else
+            warning "Skip pulling ${pkgbase}: Directory does not exist"
+        fi
+    done
+}

src/lib/pkg/repo.sh

@@ -5,49 +5,36 @@
 [[ -z ${ARTOOLS_INCLUDE_REPO_SH:-} ]] || return 0
 ARTOOLS_INCLUDE_REPO_SH=1
 
+# shellcheck source=src/lib/pkg/db/db.sh
+source "${LIBDIR}"/pkg/db/db.sh
+
 set -e
 
+
 artixpkg_repo_usage() {
     local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
     cat <<- _EOF_
     Usage: ${COMMAND} [COMMAND] [OPTIONS]
 
     COMMANDS
-        add          add and commit pkg to repo
+        add          Add built pkgbase to repo
-        move         move and commit pkg between repos
+        move         Move built pkgbase between repos
-        remove       remove and commit pkg from repo
+        remove       Remove built pkgbase from repo
-        import       import latest tag from arch upstream
+        import       Import latest tag from arch upstream
+        show         Show the pkgbase's repo db
 
     OPTIONS
         -h, --help     Show this help text
 
     EXAMPLES
-        $ ${COMMAND} add extra libfoo
+        $ ${COMMAND} add world libfoo
-        $ ${COMMAND} remove extra libfoo
+        $ ${COMMAND} remove world libfoo
-        $ ${COMMAND} move extra-testing extra libfoo
+        $ ${COMMAND} move world-gremlins world libfoo
         $ ${COMMAND} import libfoo
+        $ ${COMMAND} show libfoo
 _EOF_
 }
 
-ARTIX_DB=(
-    core
-    extra
-    community
-    multilib
-    core-testing
-    extra-testing
-    community-testing
-    multilib-testing
-    core-staging
-    extra-staging
-    community-staging
-    multilib-staging
-    kde-unstable
-    gnome-unstable
-    core-rebuild
-    extra-rebuild
-)
-
 artixpkg_repo() {
     if (( $# < 1 )); then
         artixpkg_repo_usage
@@ -64,7 +51,7 @@ artixpkg_repo() {
         add)
                 _ARTOOLS_COMMAND+=" $1"
                 shift
-                # shellcheck source=lib/pkg/repo/add.sh
+                # shellcheck source=src/lib/pkg/repo/add.sh
                 source "${LIBDIR}"/pkg/repo/add.sh
                 artixpkg_repo_add "$@"
                 exit 0
@@ -72,7 +59,7 @@ artixpkg_repo() {
         move)
                 _ARTOOLS_COMMAND+=" $1"
                 shift
-                # shellcheck source=lib/pkg/repo/move.sh
+                # shellcheck source=src/lib/pkg/repo/move.sh
                 source "${LIBDIR}"/pkg/repo/move.sh
                 artixpkg_repo_move "$@"
                 exit 0
@@ -80,7 +67,7 @@ artixpkg_repo() {
         remove)
                 _ARTOOLS_COMMAND+=" $1"
                 shift
-                # shellcheck source=lib/pkg/repo/remove.sh
+                # shellcheck source=src/lib/pkg/repo/remove.sh
                 source "${LIBDIR}"/pkg/repo/remove.sh
                 artixpkg_repo_remove "$@"
                 exit 0
@@ -88,11 +75,19 @@ artixpkg_repo() {
         import)
                 _ARTOOLS_COMMAND+=" $1"
                 shift
-                # shellcheck source=lib/pkg/repo/import.sh
+                # shellcheck source=src/lib/pkg/repo/import.sh
                 source "${LIBDIR}"/pkg/repo/import.sh
                 artixpkg_repo_import "$@"
                 exit 0
         ;;
+        show)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=src/lib/pkg/repo/show.sh
+                source "${LIBDIR}"/pkg/repo/show.sh
+                artixpkg_repo_show "$@"
+                exit 0
+        ;;
         -*)
             die "invalid argument: %s" "$1"
         ;;

src/lib/pkg/repo/add.sh

@@ -0,0 +1,132 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_ADD_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_ADD_SH=1
+
+set -e
+
+
+artixpkg_repo_add_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -p, --push         Push pkgbase
+        -r, --rebuild      Triggers a rebuild
+        -n, --nocheck      Disable the check function
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} world-gremlins libfoo
+        $ ${COMMAND} -p world-gremlins libfoo
+_EOF_
+}
+
+artixpkg_repo_add() {
+    if (( $# < 1 )); then
+        artixpkg_repo_add_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local PUSH=0
+    local DEST=''
+    local REBUILD=0
+    local NOCHECK=0
+    local ADD=1
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_repo_add_usage
+                exit 0
+            ;;
+            -p|--push)
+                PUSH=1
+                shift
+            ;;
+            -r|--rebuild)
+                REBUILD=1
+                shift
+            ;;
+            -n|--nocheck)
+                NOCHECK=1
+                shift
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                break
+            ;;
+        esac
+    done
+
+    DEST="$1"
+    pkgbases+=("$@")
+
+    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
+        die "${DEST} does not exist!"
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                if [[ ! -f PKGBUILD ]]; then
+                    die "No PKGBUILD found in (%s)" "${pkgbase}"
+                fi
+
+                # shellcheck source=contrib/makepkg/PKGBUILD.proto
+                source PKGBUILD
+
+                update_yaml_base
+                update_yaml_add "${REBUILD}" "${ADD}" "${NOCHECK}" "${DEST}"
+
+                local commit_msg
+                commit_msg=$(get_commit_msg 'add' "${DEST}")
+
+                if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+
+                    stat_busy 'Staging files'
+                    for f in $(git ls-files --others); do
+                        git add "$f"
+                    done
+                    for f in $(git ls-files --modified); do
+                        git add "$f"
+                    done
+                    for f in $(git ls-files --deleted); do
+                        git rm "$f"
+                    done
+                    stat_done
+
+                    msg 'Commit'
+                    git commit -m "${commit_msg}"
+
+                    if (( PUSH )); then
+                        msg "Push (${pkgbase})"
+                        git push origin master
+                    fi
+
+                    msg "Querying ${pkgbase} ..."
+                    if ! show_db; then
+                        warning "Could not query ${REPO_DB}"
+                    fi
+                fi
+            )
+        fi
+
+    done
+}

src/lib/pkg/repo/import.sh

@@ -7,10 +7,11 @@ ARTOOLS_INCLUDE_REPO_IMPORT_SH=1
 
 set -e
 
+
 patch_pkgbase(){
     local name="$1"
     local pkgbuild
-    pkgbuild=trunk/PKGBUILD
+    pkgbuild=PKGBUILD
 
     sed -e 's|arch-meson|artix-meson|' -i "${pkgbuild}"
 
@@ -25,7 +26,7 @@ patch_pkgbase(){
             msg "Patching %s" "${name}"
             sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "${pkgbuild}"
             sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i "$pkgpath"/config
+                -i config
         ;;
         gstreamer|gst-plugins-*|licenses)
             msg "Patching %s" "${name}"
@@ -43,7 +44,7 @@ artixpkg_repo_import_usage() {
     Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
 
     OPTIONS
-        --switch TAG       Switch the current trunk to a specified version tag
+        --switch TAG       Switch the current workspace to a specified version tag
         -h, --help         Show this help text
 
     EXAMPLES
@@ -61,11 +62,10 @@ artixpkg_repo_import() {
     # options
     local pkgbases=()
     local pkgbase
-    local upstream_url
-    upstream_url="https://gitlab.archlinux.org/archlinux/packaging/packages"
     local TAG
     local rsync_args=()
-    rsync_args+=(-aWxvci --progress --delete-before --no-R --no-implied-dirs --exclude '.git')
+    rsync_args+=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
+    rsync_args+=(--exclude '.git'  --exclude 'Jenkinsfile' --exclude '.gitignore' --exclude 'README.md')
 
     while (( $# )); do
         case $1 in
@@ -97,14 +97,15 @@ artixpkg_repo_import() {
                 continue
             fi
             ( cd "${pkgbase}" || return
+
                 stat_busy "Checking for upstream url"
                 if ! git config --local --get remote.upstream.url &>/dev/null; then
-                    git remote add upstream "${upstream_url}"/${pkgbase}.git
+                    git remote add upstream "${GIT_UPSTREAM_URL}/${pkgbase}".git
                 fi
                 stat_done
 
                 stat_busy "Fetching upstream tags"
-                git fetch upstream --tags
+                git fetch --tags upstream main
                 stat_done
 
                 local latest version
@@ -123,7 +124,8 @@ artixpkg_repo_import() {
                 rsync "${rsync_args[@]}" "$(pwd)"/ "${temp}"/ &>/dev/null
                 git checkout master &>/dev/null
                 git branch -D "${version}" &>/dev/null
-                rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/trunk/ &>/dev/null
+
+                rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ &>/dev/null
 
                 patch_pkgbase "${pkgbase}"
 

src/lib/pkg/repo/move.sh

@@ -0,0 +1,119 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_MOVE_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_MOVE_SH=1
+
+set -e
+
+
+artixpkg_repo_move_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [SOURCE_REPO] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -p, --push         Push pkgbase
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} world-gremlins world libfoo
+        $ ${COMMAND} -p world-gremlins world libfoo
+_EOF_
+}
+
+artixpkg_repo_move() {
+    if (( $# < 1 )); then
+        artixpkg_repo_move_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local PUSH=0
+
+    local DEST
+    local SRC
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_repo_move_usage
+                exit 0
+            ;;
+            -p|--push)
+                PUSH=1
+                shift
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                break
+            ;;
+        esac
+    done
+
+   	SRC="$1"
+    DEST="$2"
+    shift 2
+
+    if ! in_array "${SRC}" "${ARTIX_DB[@]}"; then
+        die "${SRC} does not exist!"
+    fi
+    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
+        die "${DEST} does not exist!"
+    fi
+
+    pkgbases+=("$@")
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                if [[ ! -f PKGBUILD ]]; then
+                    die "No PKGBUILD found in (%s)" "${pkgbase}"
+                fi
+
+                local commit_msg
+                commit_msg=$(get_commit_msg 'move' "${DEST}" "${SRC}")
+
+                update_yaml_move "${SRC}" "${DEST}"
+
+                if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+
+                    stat_busy 'Staging files'
+                    for f in $(git ls-files --modified); do
+                        if [[ "$f" == "${REPO_DB}" ]]; then
+                            git add "$f"
+                        fi
+                    done
+                    stat_done
+
+                    msg 'Commit'
+                    git commit -m "${commit_msg}"
+
+                    if (( PUSH )); then
+                        msg "Push (${pkgbase})"
+                        git push origin master
+                    fi
+
+                    msg "Querying ${pkgbase} ..."
+                    if ! show_db; then
+                        warning "Could not query ${REPO_DB}"
+                    fi
+                fi
+            )
+        fi
+
+    done
+}

src/lib/pkg/repo/remove.sh

@@ -0,0 +1,112 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_REMOVE_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_REMOVE_SH=1
+
+set -e
+
+
+artixpkg_repo_remove_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -p, --push         Push pkgbase
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} world-gremlins libfoo
+        $ ${COMMAND} -p world-gremlins libfoo
+_EOF_
+}
+
+artixpkg_repo_remove() {
+    if (( $# < 1 )); then
+        artixpkg_repo_remove_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local PUSH=0
+    local DEST=''
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_repo_remove_usage
+                exit 0
+            ;;
+            -p|--push)
+                PUSH=1
+                shift
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                break
+            ;;
+        esac
+    done
+
+    DEST="$1"
+    pkgbases=("$@")
+
+    if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
+        die "${DEST} does not exist!"
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                if [[ ! -f PKGBUILD ]]; then
+                    die "No PKGBUILD found in (%s)" "${pkgbase}"
+                fi
+
+                local commit_msg
+                commit_msg=$(get_commit_msg 'remove' "${DEST}")
+
+                update_yaml_remove "${DEST}"
+
+                if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+
+                    stat_busy 'Staging files'
+                    for f in $(git ls-files --modified); do
+                        if [[ "$f" == "${REPO_DB}" ]]; then
+                            git add "$f"
+                        fi
+                    done
+                    stat_done
+
+                    msg 'Commit'
+                    git commit -m "${commit_msg}"
+
+                    if (( PUSH )); then
+                        msg "Push (${pkgbase})"
+                        git push origin master
+                    fi
+
+                    msg "Querying ${pkgbase} ..."
+                    if ! show_db; then
+                        warning "Could not query ${REPO_DB}"
+                    fi
+
+                fi
+            )
+        fi
+
+    done
+}

src/lib/pkg/repo/show.sh

@@ -0,0 +1,114 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_SHOW_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_SHOW_SH=1
+
+set -e
+
+
+has_changeset(){
+    git fetch origin &>/dev/null
+
+    if [[ $(git rev-parse HEAD) != $(git rev-parse @{u}) ]]; then
+        msg2 "remote changes: yes"
+        return 0
+    fi
+    msg2 "remote changes: no"
+    return 1
+}
+
+artixpkg_repo_show_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [DEST_REPO] [PKGBASE]...
+
+    OPTIONS
+        -b, --base         Show srcinfo base
+        -p, --pkgs         Show srcinfo pkgs
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo
+        $ ${COMMAND} -b libfoo
+        $ ${COMMAND} -p libfoo
+_EOF_
+}
+
+artixpkg_repo_show() {
+    if (( $# < 1 )); then
+        artixpkg_repo_show_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+    local SRC_BASE=0
+    local SRC_PKGS=0
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_repo_show_usage
+                exit 0
+            ;;
+            -b|--base)
+                SRC_BASE=1
+                shift
+            ;;
+            -p|--pkgs)
+                SRC_PKGS=1
+                shift
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                break
+            ;;
+        esac
+    done
+
+    pkgbases=("$@")
+
+    for pkgbase in "${pkgbases[@]}"; do
+
+        if [[ -d "${pkgbase}" ]];then
+
+            if [[ ! -d "${pkgbase}/.git" ]]; then
+                error "Not a Git repository: ${pkgbase}"
+                continue
+            fi
+            ( cd "${pkgbase}" || return
+
+                msg "Checking origin for changes"
+                if has_changeset; then
+                    warning "Remote changes detected! Please update (%s)" "${pkgbase}"
+                fi
+
+                if [[ ! -f PKGBUILD ]]; then
+                    die "No PKGBUILD found in (%s)" "${pkgbase}"
+                fi
+
+                msg "Querying ${pkgbase} ..."
+                if ! show_db; then
+                    warning "Could not query ${REPO_DB}"
+                fi
+
+                if (( SRC_BASE )); then
+                    msg "Showing srcinfo base ..."
+                    show_srcinfo_base
+                fi
+
+                if (( SRC_PKGS )); then
+                    msg "Showing srcinfo pkgs ..."
+                    show_srcinfo_pkgs
+                fi
+
+            )
+        fi
+
+    done
+}

src/lib/pkg/table.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ table
 

src/lib/pkg/util.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ pkg conf
 
@@ -8,28 +10,27 @@ load_pkg_config(){
 
     [[ -f "$conf" ]] || return 1
 
-    # shellcheck source=/etc/artools/artools-pkg.conf
+    # shellcheck source=config/conf/artools-pkg.conf
-    [[ -r "$conf" ]] && . "$conf"
+    [[ -r "$conf" ]] && source "$conf"
 
     local git_domain="gitea.artixlinux.org"
 
-    GIT_URL=${GIT_URL:-"https://${git_domain}"}
+    GIT_HTTPS=${GIT_HTTPS:-"https://${git_domain}"}
 
     GIT_SSH=${GIT_SSH:-"gitea@${git_domain}"}
 
     GIT_TOKEN=${GIT_TOKEN:-''}
 
-    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
+    GIT_ORG=${GIT_ORG:-'packages'}
 
-    [[ -z ${ARTIX_TREE[*]} ]] && \
+    GIT_UPSTREAM_URL=${GIT_UPSTREAM_URL:-"https://gitlab.archlinux.org/archlinux/packaging/packages"}
-    ARTIX_TREE=(main initsys desktop addons lib32)
+
+    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
 
     REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
 
     REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
 
-    GIT_UPSTREAM_URL=${GIT_UPSTREAM_URL:-"https://gitlab.archlinux.org/archlinux/packaging/packages"}
-
     DBEXT=${DBEXT:-'gz'}
 
     return 0

src/pkg/artixpkg.in

@@ -1,22 +1,14 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-23 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2021 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
+DATADIR=${DATADIR:-'@datadir@'}
 SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/api/gitea.sh
 source "${LIBDIR}"/pkg/api/gitea.sh
 
 set -e
@@ -43,7 +35,9 @@ fi
 
 export _ARTOOLS_COMMAND='artixpkg'
 
+# shellcheck source=src/lib/base/util.sh
 source "${LIBDIR}"/base/util.sh
+# shellcheck source=src/lib/pkg/util.sh
 source "${LIBDIR}"/pkg/util.sh
 
 load_makepkg_config

src/pkg/buildpkg.in

@@ -1,23 +1,16 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-23 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
+DATADIR=${DATADIR:-'@datadir@'}
 SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
+# shellcheck source=src/lib/base/util.sh
 source "${LIBDIR}"/base/util.sh
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
 
 create_first=false
@@ -97,7 +90,7 @@ fi
 #     fi
 # done
 
-check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
+check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME "${BASH_SOURCE[0]}" "$@"
 
 mkchrootpkg_args+=("${@:$OPTIND}")
 
@@ -133,7 +126,8 @@ fi
 
 # Always build official packages reproducibly
 if [[ ! -v SOURCE_DATE_EPOCH ]]; then
-    export SOURCE_DATE_EPOCH=$(date +%s)
+    SOURCE_DATE_EPOCH=$(date +%s)
+    export SOURCE_DATE_EPOCH
 fi
 
 msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"

src/pkg/checkpkg.in

@@ -1,20 +1,12 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/diff.sh
 source "${LIBDIR}"/pkg/diff.sh
 
 load_makepkg_config
@@ -70,7 +62,7 @@ if [[ ! -f PKGBUILD ]]; then
     die 'This must be run in the directory of a built package.'
 fi
 
-# shellcheck source=PKGBUILD.proto
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
 . ./PKGBUILD
 if [[ ${arch[0]} == 'any' ]]; then
     CARCH='any'

src/pkg/checkrepo.in

@@ -0,0 +1,106 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LIBDIR=${LIBDIR:-'@libdir@'}
+DATADIR=${DATADIR:-'@datadir@'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+# shellcheck source=src/lib/base/util.sh
+source "${LIBDIR}"/base/util.sh
+# shellcheck source=src/lib/pkg/util.sh
+source "${LIBDIR}"/pkg/util.sh
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/table.sh
+source "${LIBDIR}"/pkg/table.sh
+# shellcheck source=src/lib/pkg/db/db.sh
+source "${LIBDIR}"/pkg/db/db.sh
+
+shopt -s extglob
+
+extract_db() {
+    local u="$1" cdir="$2"
+    rm -rf "$cdir"
+    mkdir -p "$cdir"
+    msg2 "%s" "${cdir##*/}"
+    curl -L -s "$u" | bsdtar -xf - -C "$cdir"
+}
+
+update_linksdb_cache(){
+    msg "Updating database cache ..."
+    local cachedir url
+    for repo in "${search[@]}"; do
+        cachedir=${db_cache_dir}/linksdb/$repo
+        url=${REPOS_MIRROR}/$repo/os/${CARCH}/$repo.${linksdb_ext}
+        extract_db "$url" "$cachedir"
+    done
+    msg "Done"
+}
+
+#}}}
+
+#{{{ sogrep
+
+query_db() {
+    if ${sync}; then
+        update_linksdb_cache
+    fi
+    msg_table_header "${tableQ}" "Repo" "Package" "Library"
+    for repo in "${search[@]}"; do
+        local db
+        db=${db_cache_dir}/linksdb/$repo/
+        if [[ -d ${db} ]]; then
+            while read -rd '' pkg; do
+                read -r match
+                pkg=${pkg#"${db}"}
+                pkg="${pkg%/*}"
+                msg_row "${tableQ}" "$repo" "$pkg" "${match}"
+            done < <(grep -rZ "$library" "$db") | sort -u
+        fi
+    done
+}
+
+#}}}
+
+db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+
+linksdb_ext="links.tar.${DBEXT}"
+
+load_makepkg_config
+
+sync=false
+query=false
+search=("${ARTIX_DB[@]}")
+
+readonly tableQ="%-20s %-55s %s"
+
+usage() {
+    printf "Usage: %s [options] [query library]\n" "${0##*/}"
+    printf "    -r <repo>     Repo to query\n"
+    printf "    -s            Sync repo databases\n"
+    printf "    -q            Query repo databases for so libs\n"
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+opts='r:sqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) search=("$OPTARG") ;;
+        s) sync=true ;;
+        q) query=true ;;
+        h|?) usage 0 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+library="$1"; shift
+
+if ${query}; then
+    query_db
+fi

src/pkg/deploypkg.in

@@ -1,67 +1,60 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-23 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
+DATADIR=${DATADIR:-'@datadir@'}
 SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
+# shellcheck source=src/lib/base/util.sh
 source "${LIBDIR}"/base/util.sh
+# shellcheck source=src/lib/pkg/util.sh
 source "${LIBDIR}"/pkg/util.sh
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/deploy.sh
 source "${LIBDIR}"/pkg/deploy.sh
 
 #{{{ deploy
 
-add(){
+add() {
     if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
         msg "Found: %s" "${pkgfile}"
         packages+=("${pkgname}")
         action='add'
-        ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
+        ln -sfv "${pkgfile}"{,.sig} "${repo_path}"/
     fi
 }
 
 remove(){
-    packages+=("$(get_pkgbasename "${pkgname}")")
+    packages+=("${pkgname}")
     action='remove'
-    rm -v "$repo_path"/"${pkgname}"{,.sig}
+    # pkg removal will be done by a patched repo-remove honoring -R
 }
 
-repo_action(){
+repo_action() {
+    local repo_path
+    repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
+
     local packages=() action func="$1"
     for pkgname in "${passfiles[@]}"; do
         "$func"
     done
-    cd "$repo_path" || return
+    ( cd "${repo_path}" || return
-    if [[ -n "${action}" ]]; then
+        if [[ -n "${action}" ]]; then
-        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
+            repo-"${action}" -R "${dest_repo}.${db_ext}" "${packages[@]}"
-        if ${linksdb}; then
-            links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
         fi
-    fi
+    )
 }
 
 #}}}
 
 load_makepkg_config
 
-pkgdb_ext="db.tar.${DBEXT}"
+db_ext="db.tar.${DBEXT}"
-linksdb_ext="links.tar.${DBEXT}"
 
 add_pkg=false
 rm_pkg=false
-linksdb=false
 
 cmd=${0##*/}
 dest_repo=${cmd#*-}
@@ -71,21 +64,19 @@ usage() {
     printf '    -d <dest>          Destination repository\n'
     printf '    -a                 Add package(s) to repository\n'
     printf '    -r                 Remove package(s) from repository\n'
-    printf '    -l                 Use links db\n'
     printf '    -h                 This help\n'
     printf '\n'
     printf '\n'
     exit "$1"
 }
 
-opts='arlhd:'
+opts='arLRhd:'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         d) dest_repo="$OPTARG" ;;
         a) add_pkg=true; rm_pkg=false ;;
         r) rm_pkg=true; add_pkg=false ;;
-        l) linksdb=true ;;
         h|?) usage 0 ;;
     esac
 done
@@ -94,8 +85,6 @@ shift $(( OPTIND - 1 ))
 
 passfiles=("$@")
 
-repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
-
 if [[ -n "${passfiles[*]}" ]]; then
     if ${add_pkg}; then
         repo_action add

src/pkg/diffpkg.in

@@ -2,9 +2,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/diff.sh
 source "${LIBDIR}"/pkg/diff.sh
 
 usage() {

src/pkg/export-pkgbuild-keys.in

@@ -2,8 +2,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
 
 usage() {
@@ -32,7 +33,7 @@ if [[ ! -f PKGBUILD ]]; then
 fi
 
 mapfile -t validpgpkeys < <(
-    # shellcheck source=PKGBUILD.proto
+    # shellcheck source=contrib/makepkg/PKGBUILD.proto
     . ./PKGBUILD
     if (( ${#validpgpkeys[@]} )); then
         printf "%s\n" "${validpgpkeys[@]}"

src/pkg/find-libdeps.in

@@ -1,19 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
 
 set -e

src/pkg/finddeps.in

@@ -1,19 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
 
 match=$1
@@ -30,7 +21,7 @@ fi
 find . -type d -print0 2>/dev/null| while read -r -d '' d; do
     if [[ -f "$d/PKGBUILD" ]]; then
         pkgname=() depends=() makedepends=() optdepends=()
-        # shellcheck source=PKGBUILD.proto
+        # shellcheck source=contrib/makepkg/PKGBUILD.proto
         . "$d/PKGBUILD"
         for dep in "${depends[@]}"; do
             # lose the version comparator, if any

src/pkg/lddd.in

@@ -1,19 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
 
 ifs=$IFS

src/pkg/makerepropkg.in

@@ -6,12 +6,15 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
-DATADIR=${DATADIR:-'@datadir@/artools'}
+DATADIR=${DATADIR:-'@datadir@'}
 SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
 
+# shellcheck source=src/lib/base/util.sh
 source "${LIBDIR}"/base/util.sh
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
 
 declare -A buildinfo
@@ -95,7 +98,7 @@ get_makepkg_conf() {
         return 1
     fi
     msg2 "using makepkg.conf from ${fname}"
-    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/artools/makepkg.conf.d/${arch}.conf > "${makepkg_conf}"
+    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/artools/makepkg.conf.d/"${arch}".conf > "${makepkg_conf}"
     return 0
 }
 
@@ -121,6 +124,8 @@ usage() {
 __EOF__
 }
 
+orig_args=("$@")
+
 while getopts 'dM:c:l:h' arg; do
     case "$arg" in
         d) diffoscope=1 ;;
@@ -133,12 +138,13 @@ while getopts 'dM:c:l:h' arg; do
 done
 shift $((OPTIND - 1))
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 [[ -f PKGBUILD ]] || { error "No PKGBUILD in current directory."; exit 1; }
 
 # without arguments, get list of packages from PKGBUILD
 if [[ -z $1 ]]; then
+    # shellcheck source=contrib/makepkg/PKGBUILD.proto
     mapfile -t pkgnames < <(source PKGBUILD; pacman -Sddp --print-format '%r/%n' "${pkgname[@]}")
     wait $! || {
         error "No package file specified and failed to retrieve package names from './PKGBUILD'."
@@ -176,7 +182,7 @@ for f in "${splitpkgs[@]}"; do
 done
 
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+    mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi
 
 ORIG_HOME=${HOME}
@@ -221,7 +227,7 @@ if [[ -z "${BUILDTOOL}" ]]; then
 elif [[ "${BUILDTOOL}" = makepkg ]] && (( $(vercmp "${BUILDTOOLVER}" 6.0.1) <= 0 )); then
     get_makepkg_conf "artools-pkg-0.28.2-1-any" "${CARCH}" "${makepkg_conf}" || exit 1
 # all artools-pkg builds
-elif [[ "${BUILDTOOL}" = artools-pkg ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
+elif [[ "${BUILDTOOL}" = artools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
     true
 # fallback to current makepkg.conf
 else
@@ -252,7 +258,7 @@ chroot-run \
     /chrootbuild -C --noconfirm --log --holdver --skipinteg
 ret=$?
 
-if (( ${ret} == 0 )); then
+if (( ret == 0 )); then
     msg2 "built succeeded! built packages can be found in ${namespace}/build/pkgdest"
     msg "comparing artifacts..."
 

src/pkg/mkchrootpkg.in

@@ -1,24 +1,16 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
 source "${LIBDIR}"/base/chroot.sh
 
-export BUILDTOOL=artools-pkg
+export BUILDTOOL=@buildtool@
-export BUILDTOOLVER=m4_artools_pkg_version
+export BUILDTOOLVER=@buildtoolver@
 
 shopt -s nullglob
 
@@ -38,7 +30,7 @@ run_namcap=0
 run_checkpkg=0
 temp_chroot=0
 
-bindmounts=()
+bindmounts=''
 
 copy=$USER
 [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
@@ -151,7 +143,7 @@ install_packages() {
 
     cp -- "${install_pkgs[@]}" "$copydir/root/"
     chroot-run \
-        -b "${bindmounts[@]}" \
+        -b "${bindmounts}" \
         "$copydir" \
         bash -c 'yes y | pacman -U -- "$@"' -bash "${pkgnames[@]/#//root/}"
     ret=$?
@@ -199,7 +191,7 @@ EOF
         declare -f _chrootbuild
         declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
         declare -p BUILDTOOL 2>/dev/null
-		declare -p BUILDTOOLVER 2>/dev/null
+        declare -p BUILDTOOLVER 2>/dev/null
         printf '_chrootbuild "$@" || exit\n'
 
         if (( run_namcap )); then
@@ -226,8 +218,8 @@ _chrootbuild() {
     # ${1} is OK, but $foo or $1 isn't.
     # https://bugzilla.sudo.ws/show_bug.cgi?id=765
     sudo --preserve-env=SOURCE_DATE_EPOCH \
-        -preserve-env=BUILDTOOL \
+        --preserve-env=BUILDTOOL \
-		--preserve-env=BUILDTOOLVER \
+        --preserve-env=BUILDTOOLVER \
         -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
     ret=$?
     case $ret in
@@ -297,7 +289,7 @@ opts='hcur:I:l:nNCTb:U:'
 while getopts "${opts}" arg; do
     case "$arg" in
         c) clean_first=1 ;;
-        b) bindmounts+=("$OPTARG") ;;
+        b) bindmounts="$OPTARG" ;;
         u) update_first=1 ;;
         r) passeddir="$OPTARG" ;;
         I) install_pkgs+=("$OPTARG") ;;
@@ -315,7 +307,7 @@ done
 [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
 makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER "${BASH_SOURCE[0]}" "$@"
 
 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$passeddir")
@@ -362,13 +354,13 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
     sync_chroot "$chrootdir" "$copydir" "$copy"
 fi
 
-bindmounts+=("-B:${PWD}:/startdir" "-B:${SRCDEST}:/srcdest")
 
 (( update_first )) && chroot-run \
-        -b "${bindmounts[*]}" \
+        -b "${bindmounts}" \
         "$copydir" \
         pacman -Syuu --noconfirm
 
+
 if [[ -n ${install_pkgs[*]:-} ]]; then
     install_packages
     ret=$?
@@ -386,7 +378,7 @@ download_sources
 prepare_chroot
 
 if chroot-run \
-    -b "${bindmounts[*]}" \
+    -b "${bindmounts} -B:${PWD}:/startdir -B:${SRCDEST}:/srcdest" \
     "$copydir" \
     /chrootbuild "${makepkg_args[@]}"
 then

src/pkg/mkdepgraph.in

@@ -1,16 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
 mk_tree_graph(){
     printf "%s\n" "$(pactree "${tree_args[@]}" "${package}")" \

src/pkg/pkg2yaml.in

@@ -0,0 +1,142 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/yaml.sh
+source "${LIBDIR}"/base/yaml.sh
+
+source "${MAKEPKG_LIBRARY}"/util/pkgbuild.sh
+source "${MAKEPKG_LIBRARY}"/util/schema.sh
+
+#{{{ functions
+
+srcyaml_write_attr(){
+    local ident1="$1" ident2="$2" ident3="$3"
+    local attrname=$4 attrvalues=("${@:5}")
+
+    # normalize whitespace, strip leading and trailing
+    attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
+    attrvalues=("${attrvalues[@]#[[:space:]]}")
+    attrvalues=("${attrvalues[@]%[[:space:]]}")
+
+    case $attrname in
+        pkgver|pkgrel|epoch|url|install|changelog)
+            for v in "${attrvalues[@]}"; do
+                Yaml+=$(write_yaml_map "$ident3" "$attrname" "$v")
+            done
+        ;;
+        pkgdesc)
+            Yaml+=$(write_yaml_map "$ident1" "$attrname" "${attrvalues[@]}")
+        ;;
+        *)
+            Yaml+=$(write_yaml_map "$ident1" "$attrname")
+            for v in "${attrvalues[@]}"; do
+                Yaml+=$(write_yaml_seq "$ident2" "$v")
+            done
+        ;;
+    esac
+}
+
+pkgbuild_extract_to_yaml() {
+    local pkgname=$1 attrname=$2 isarray=$3 outvalue=
+
+    if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then
+        [[ -z $pkgname ]] && srcyaml_write_attr 2 4 2 "$attrname" "${outvalue[@]}"
+        [[ -n $pkgname ]] && srcyaml_write_attr 4 6 2 "$attrname" "${outvalue[@]}"
+    fi
+}
+
+srcyaml_write_section_details() {
+    local attr package_arch a
+    local multivalued_arch_attrs=(source provides conflicts depends replaces
+                                  optdepends makedepends checkdepends
+                                  "${known_hash_algos[@]/%/sums}")
+
+    for attr in "${singlevalued[@]}"; do
+        pkgbuild_extract_to_yaml "$1" "$attr" 0
+    done
+
+    for attr in "${multivalued[@]}"; do
+        pkgbuild_extract_to_yaml "$1" "$attr" 1
+    done
+
+    get_pkgbuild_attribute "$1" 'arch' 1 'package_arch'
+    for a in "${package_arch[@]}"; do
+        # 'any' is special. there's no support for, e.g. depends_any.
+        [[ $a = any ]] && continue
+
+        for attr in "${multivalued_arch_attrs[@]}"; do
+            pkgbuild_extract_to_yaml "$1" "${attr}_$a" 1
+        done
+    done
+}
+
+yaml_write_global() {
+    local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog)
+    local multivalued=(arch groups license checkdepends makedepends
+                        depends optdepends provides conflicts replaces
+                        noextract options backup
+                        source validpgpkeys "${known_hash_algos[@]/%/sums}")
+
+    Yaml+=$(write_yaml_map 0 "pkgbase")
+    Yaml+=$(write_yaml_map 2 "name" "${pkgbase:-${pkgname}}")
+
+    srcyaml_write_section_details ""
+}
+
+yaml_write_package() {
+    local singlevalued=(pkgdesc url install changelog)
+    local multivalued=(arch groups license checkdepends depends optdepends
+                       provides conflicts replaces options backup)
+
+    Yaml+=$(write_yaml_map 0 "pkgnames")
+    for pkg in "${pkgname[@]}"; do
+        Yaml+=$(write_yaml_seq_map 2 "pkgname" "$pkg")
+        srcyaml_write_section_details "$pkg"
+    done
+}
+
+write_srcyaml() {
+    Yaml=$(write_yaml_header)
+    yaml_write_global
+    yaml_write_package
+
+#     local version
+#     version=$(get_full_version)
+#     Yaml+=$(write_yaml_map 2 "version" "${version}")
+
+    printf '%s\n' "${Yaml}"
+}
+
+#}}}
+
+usage() {
+    printf 'Usage: %s [options]\n' "${0##*/}"
+    printf '    -h            This help\n'
+    printf '\n'
+    exit "$1"
+}
+
+load_makepkg_config
+
+opts='h'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        h|?) usage 0 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+srcpath=$(readlink -f "$1")
+
+[[ -f "$srcpath"/PKGBUILD ]] || die "%s/PKGBUILD does not exist!" "$srcpath"
+
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
+source "$srcpath"/PKGBUILD
+
+write_srcyaml

src/pkg/signpkg.in

@@ -1,20 +1,12 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018 Artix Linux Developers
-#
-# 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; version 2 of the License.
-#
-# 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.
 
-LIBDIR=${LIBDIR:-'@libdir@/artools'}
+LIBDIR=${LIBDIR:-'@libdir@'}
 
+# shellcheck source=src/lib/base/message.sh
 source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/deploy.sh
 source "${LIBDIR}"/pkg/deploy.sh
 
 load_makepkg_config