artixpkg: add basic token check

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

.gitignore

@@ -6,3 +6,9 @@ data/schemas/*.conf
 .project
 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,179 +1,175 @@
-V=0.26
+SHELL=/bin/bash
+
+V=0.31
+BUILDTOOLVER ?= $(V)
+
+CHROOTVER=0.11
 
 TOOLS = artools
-PREFIX ?= /usr
 SYSCONFDIR = /etc
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share
+PREFIX = /usr/local
+LIBDIR = $(PREFIX)/share/$(TOOLS)/lib
+DATADIR = $(PREFIX)/share/$(TOOLS)
+BUILDDIR = build
 
-BASE_CONF = \
-	data/conf/artools-base.conf
+rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
 
-BASE_BIN = \
-	bin/base/chroot-run \
-	bin/base/mkchroot \
-	bin/base/basestrap \
-	bin/base/artix-chroot \
-	bin/base/fstabgen
+BINPROGS_SRC_BASE = $(wildcard src/base/*.in)
+BINPROGS_BASE = $(addprefix $(BUILDDIR)/,$(patsubst src/base/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC_BASE))))
+BINPROGS_SRC_PKG = $(wildcard src/pkg/*.in)
+BINPROGS_PKG = $(addprefix $(BUILDDIR)/,$(patsubst src/pkg/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC_PKG))))
+BINPROGS_SRC_ISO = $(wildcard src/iso/*.in)
+BINPROGS_ISO = $(addprefix $(BUILDDIR)/,$(patsubst src/iso/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC_ISO))))
 
-BASE_DATA = \
-	$(wildcard data/pacman/pacman*.conf)
+LIBRARY_SRC_BASE = $(call rwildcard,src/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))))
 
-PKG_CONF = \
-	data/conf/artools-pkg.conf
+MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
+PACMAN_CONFIGS=$(wildcard config/pacman/*)
+SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 
-SETARCH_ALIASES = \
-
-PKG_BIN = \
-	bin/pkg/buildpkg \
-	bin/pkg/deploypkg \
-	bin/pkg/commitpkg \
-	bin/pkg/comparepkg \
-	bin/pkg/mkchrootpkg \
-	bin/pkg/pkg2yaml \
-	bin/pkg/buildtree \
-	bin/pkg/lddd \
-	bin/pkg/links-add \
-	bin/pkg/checkpkg \
-	bin/pkg/finddeps \
-	bin/pkg/find-libdeps \
-	bin/pkg/batchpkg \
-	bin/pkg/signpkg \
-	bin/pkg/checkrepo \
-	bin/pkg/gitearepo
-
-LN_COMMITPKG = \
-	extrapkg \
-	corepkg \
-	testingpkg \
-	stagingpkg \
-	communitypkg \
-	community-testingpkg \
-	community-stagingpkg \
-	multilibpkg \
-	multilib-testingpkg \
-	multilib-stagingpkg \
-	kde-unstablepkg \
-	gnome-unstablepkg \
-	rebuildpkg
+TOOLS_CONFIGS_BASE=$(wildcard config/conf/*base*)
+TOOLS_CONFIGS_PKG=$(wildcard config/conf/*pkg*)
+TOOLS_CONFIGS_ISO=$(wildcard config/conf/*iso*)
 
 LN_BUILDPKG = \
 	buildpkg-system \
+	buildpkg-system-gremlins \
+	buildpkg-system-goblins \
 	buildpkg-world \
-	buildpkg-gremlins \
-	buildpkg-goblins \
-	buildpkg-galaxy \
-	buildpkg-galaxy-gremlins \
-	buildpkg-galaxy-goblins \
+	buildpkg-world-gremlins \
+	buildpkg-world-goblins \
 	buildpkg-lib32 \
 	buildpkg-lib32-gremlins \
 	buildpkg-lib32-goblins \
-	buildpkg-kde-wobble \
-	buildpkg-gnome-wobble
-
-LN_DEPLOYPKG = \
-	deploypkg-system \
-	deploypkg-world \
-	deploypkg-gremlins \
-	deploypkg-goblins \
-	deploypkg-galaxy \
-	deploypkg-galaxy-gremlins \
-	deploypkg-galaxy-goblins \
-	deploypkg-lib32 \
-	deploypkg-lib32-gremlins \
-	deploypkg-lib32-goblins \
-	deploypkg-kde-wobble \
-	deploypkg-gnome-wobble
-
-PKG_DATA = \
-	data/pacman/makepkg.conf \
-	data/valid-names.conf
-
-PATCHES = \
-	$(wildcard data/patches/*.patch)
-
-ISO_CONF = \
-	data/conf/artools-iso.conf
-
-ISO_BIN = \
-	bin/iso/buildiso
+	buildpkg-galaxy \
+	buildpkg-galaxy-gremlins \
+	buildpkg-galaxy-goblins
 
 LN_BUILDISO = \
 	buildiso-gremlins \
 	buildiso-goblins
 
-DIRMODE = -dm0755
-FILEMODE = -m0644
-MODE =  -m0755
-LN = ln -sf
+all: binprogs_base binprogs_pkg binprogs_iso library_base library_pkg library_iso conf_base conf_pkg conf_iso
+binprogs_base: $(BINPROGS_BASE)
+binprogs_pkg: $(BINPROGS_PKG)
+binprogs_iso: $(BINPROGS_ISO)
+library_base: $(LIBRARY_BASE)
+library_pkg: $(LIBRARY_PKG)
+library_iso: $(LIBRARY_ISO)
+
+edit = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
+	-e "s|@buildtool[@]|$(TOOLS)|g" \
+	-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g" \
+	-e "s|@chrootver[@]|$(CHROOTVER)|g"
+
+GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
+
 RM = rm -f
-M4 = m4 -P --define=m4_artools_pkg_version=$V
-CHMODAW = chmod a-w
-CHMODX = chmod +x
 
-BIN = $(BASE_BIN) $(PKG_BIN) $(ISO_BIN)
+define buildInScript
+$(1)/%: $(2)%$(3)
+	$$(GEN_MSG)
+	@mkdir -p $$(dir $$@)
+	@$(RM) "$$@"
+	@cat $$< | $(edit) >$$@
+	@chmod $(4) "$$@"
+	@bash -O extglob -n "$$@"
+endef
 
-all: $(BIN)
+$(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))
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g"
+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
 
-%: %.in Makefile lib/util-base.sh
-	@echo "GEN $@"
-	@$(RM) "$@"
-	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | $(M4) | $(EDIT) >$@
-	@$(CHMODAW) "$@"
-	@$(CHMODX) "$@"
-	@bash -O extglob -n "$@"
+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 $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+install_base: binprogs_base
+	install -dm0755 $(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)
-	install $(MODE) $(BASE_BIN) $(DESTDIR)$(BINDIR)
+	for conf in $(notdir $(TOOLS_CONFIGS_BASE)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d
-	for a in ${SETARCH_ALIASES}; do install $(FILEMODE) setarch-aliases.d/$$a $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d; done
+install_pkg: binprogs_pkg
+	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_pkg:
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(PKG_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+	for conf in $(notdir $(TOOLS_CONFIGS_PKG)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
 
-	install $(DIRMODE) $(DESTDIR)$(BINDIR)
-	install $(MODE) $(PKG_BIN) $(DESTDIR)$(BINDIR)
+	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
+	for a in $(SETARCH_ALIASES); do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done
+	for l in $(LN_BUILDPKG); do ln -sf buildpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
+	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 
-	$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
+install_iso: binprogs_iso
+	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)
 
-	$(LN) links-add $(DESTDIR)$(BINDIR)/links-remove
+	for conf in $(notdir $(TOOLS_CONFIGS_ISO)); do install -Dm0644 $(BUILDDIR)/$(TOOLS)/$$conf $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$${conf##*/}; done
 
-	for l in $(LN_COMMITPKG); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
-	for l in $(LN_BUILDPKG); do $(LN) buildpkg $(DESTDIR)$(BINDIR)/$$l; done
-	for l in $(LN_DEPLOYPKG); do $(LN) deploypkg $(DESTDIR)$(BINDIR)/$$l; done
+	for l in $(LN_BUILDISO); do ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/$$l; done
 
-	$(LN) artix-chroot $(DESTDIR)$(BINDIR)/artools-chroot
+install: all install_base install_pkg install_iso
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FILEMODE) $(PKG_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
+uninstall:
+	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)$(DATADIR)/$(TOOLS)/patches
-	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
+dist:
+	git archive --format=tar --prefix=$(TOOLS)-$(V)/ v$(V) | gzip > $(TOOLS)-$(V).tar.gz
+	gpg --detach-sign --use-agent $(TOOLS)-$(V).tar.gz
 
-install_iso:
-	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	install $(FILEMODE) $(ISO_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
+check: $(BINPROGS_SRC_BASE) $(BINPROGS_SRC_PKG) $(BINPROGS_SRC_ISO) config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
+	shellcheck -x $^
 
-	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
+.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:

README.md

@@ -12,25 +12,40 @@ artools
 ##### Buildtime:
 
 * make
-* git
-* m4
+* shellcheck
 
 ##### Runtime:
 
 - base:
-  * os-prober
+  * awk
+  * bash
+  * coreutils
+  * grep
   * pacman
+  * util-linux
+  * sed
 
 - pkg:
-  * namcap
-  * git-subrepo
+  * artools-base
+  * binutils
+  * diffutils
+  * findutils
+  * go-yq
+  * openssh
+  * parallel
   * rsync
 
 - iso:
+  * artools-base
   * dosfstools
-  * libisoburn
-  * squashfs-tools
+  * e2fsprogs
+  * findutils
   * grub
+  * libarchive
+  * libisoburn
+  * mtools
+  * squashfs-tools
+
 
 #### Configuration
 
@@ -59,11 +74,25 @@ Specifying args will override artools-{base,pkg,iso}.conf settings.
 Both, pacman.conf and makepkg.conf for chroots are loaded from
 
 ```bash
-usr/share/artools/{makepkg,pacman-*}.conf
+usr/share/artools/makepkg.conf.d/makepkg.conf
+```
+
+```bash
+usr/share/artools/pacmanconf.d/${repo}.conf
 ```
 
 and can be overridden dropping them in
 
+```bash
+$HOME/.config/artools/makepkg.conf.d/
+```
+
+```bash
+$HOME/.config/artools/pacman.conf.d/
+```
+
+artools-*.conf:
+
 ```bash
 $HOME/.config/artools/
 ```

bin/base/artix-chroot.in

@@ -1,151 +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.
-
-shopt -s extglob
-
-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/mount.sh)
-
-#{{{ functions
-
-chroot_part_mount() {
-    msg2 "mount: [%s]" "$2"
-    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
-}
-
-chroot_part_umount() {
-    chroot_api_umount
-    msg2 "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_PART_MOUNTS
-}
-
-detect(){
-    local detected
-    detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
-    echo "${detected}"
-}
-
-# $1: os-prober array
-get_os_name(){
-    local str=$1
-    str="${str#*:}"
-    str="${str#*:}"
-    str="${str%:*}"
-    echo "$str"
-}
-
-mount_os(){
-    CHROOT_ACTIVE_PART_MOUNTS=()
-    CHROOT_ACTIVE_MOUNTS=()
-
-    trap_setup chroot_part_umount
-
-    chroot_part_mount "$2" "$1"
-
-    local mounts
-    mounts=$(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' "$1"/etc/fstab)
-
-    for entry in ${mounts}; do
-        entry=${entry//UUID=}
-        local dev=${entry%:*} mp=${entry#*:}
-        case "${entry#*:}" in
-            '/'|'swap'|'none') continue ;;
-            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
-        esac
-    done
-
-    chroot_setup "$1" true
-    chroot_add_resolv_conf "$1"
-}
-
-select_os(){
-    local os_list=( "$(detect)" ) count=${#os_list[@]}
-    if [[ ${count} -gt 1 ]];then
-        msg "Detected systems:"
-        local i=0
-        for os in "${os_list[@]}"; do
-            local last=${os##*:}
-            case $last in
-                'efi') count=$((count-1)) ;;
-                *) msg2 "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
-            esac
-        done
-        i=0
-        msg "Select system to mount [0-%s] : " "$((count-1))"
-        read -r select
-    else
-        select=0
-    fi
-    local os_str=${os_list[$select]} type
-    type=$os_str
-    root=${os_str%%:*}
-    type=${type##*:}
-    if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name "$os_str")" "$root"
-        mount_os "$1" "$root"
-    else
-        die "You can't mount %s!" "$select"
-    fi
-}
-
-#}}}
-
-automount=false
-
-usage() {
-    echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
-    echo '    -a             Automount detected linux system'
-    echo '    -h             Print this help message'
-    echo ''
-    echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
-    echo ''
-    echo "    If 'automount' is true, ${0##*/} will launch /bin/bash"
-    echo "    and ${chrootdir}."
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts=':ha'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        a) automount=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument ${arg}"; usage 1 ;;
-    esac
-done
-shift $(( OPTIND - 1 ))
-
-check_root
-
-if ${automount};then
-    chrootdir=/mnt
-    run_args=(/bin/bash)
-
-    select_os "${chrootdir}"
-else
-    chrootdir=$1
-    shift
-    run_args=("$@")
-
-    [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
-
-    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_add_resolv_conf "${chrootdir}"
-fi
-
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args[@]}"

bin/pkg/batchpkg.in

@@ -1,115 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-20 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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-
-#{{{ functions
-
-batch_move() {
-    local name="${1:-pkg_moves}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local src=${entry%:*}
-        src=${src#*:}
-        local dest=${entry%%:*}
-        if ${runlist}; then
-            "${dest}"pkg -s "${src}" -u -p "${pkg}"
-        else
-            msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_create() {
-    local name="${1:-pkg_create}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local group=${entry%:*}
-        group=${group#*:}
-        local team=${entry%%:*}
-        if ${runlist}; then
-            buildtree -n -p "${pkg}" -t "${team}" -g "${group}"
-            buildtree -i -p "${pkg}"
-            commitpkg -p "${pkg}"
-        else
-            msg "%s" "buildtree -n -p ${pkg} -t ${team} -g ${group}"
-            msg2 "%s" "buildtree -i -p ${pkg}"
-            msg2 "%s" "commitpkg -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_update() {
-    local name="${1:-pkg_upgrades}"
-    local pkglist=${TREE_DIR_ARTIX}/$name.list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry#*:}
-        local dest=${entry%:*}
-        if ${runlist}; then
-            buildtree -i -p "${pkg}"
-            "${dest}"pkg -u -p "${pkg}"
-        else
-            msg "buildtree -i -p ${pkg}"
-            msg2 "${dest}pkg -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-#}}}
-
-usage() {
-    echo "Usage: ${0##*/} [optional listname]"
-    echo '    -r                 Run generated commands'
-    echo '    -c                 Create subrepos from list'
-    echo '    -u                 Update subrepos from list'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-runlist=false
-create=false
-update=false
-
-opts='rcuh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) runlist=true ;;
-        c) create=true ;;
-        u) update=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-listname="$1"; shift
-
-if ${create}; then
-    batch_create "${listname}"
-elif ${update}; then
-    batch_update "${listname}"
-else
-    batch_move "${listname}"
-fi

bin/pkg/buildpkg.in

@@ -1,121 +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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/base/common.sh)
-m4_include(lib/base/chroot.sh)
-
-create_first=false
-rebuild=false
-
-mkchrootpkg_args=(-c -n)
-
-cmd=${0##*/}
-repo=${cmd#*-}
-base_devel=('base-devel')
-chroots_pkg="${CHROOTS_DIR}/buildpkg"
-arch=$(uname -m)
-
-usage() {
-    echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
-    echo "    -r <dir>           Create chroots in this directory"
-    echo "    -d <dir>           Destination repo chroot"
-    echo '    -c                 Recreate the chroot before building'
-    echo '    -m                 Major rebuild'
-    echo '    -N                 Disable check() function'
-    echo '    -C                 Run checkpkg after built'
-    echo '    -h                 This help'
-    echo ''
-    echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
-    echo ''
-    exit "$1"
-}
-
-opts='hcCNmr:d:'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) chroots_pkg="$OPTARG" ;;
-        d) repo="$OPTARG" ;;
-        c) create_first=true ;;
-        m) rebuild=true ;;
-        C) mkchrootpkg_args+=(-C) ;;
-        N) mkchrootpkg_args+=(-N) ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
-    esac
-done
-
-if ${rebuild};then
-    repo='default'
-else
-    case ${repo} in
-        system|world|galaxy) repo='default' ;;
-        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
-    esac
-fi
-
-get_pacman_conf "${repo}"
-
-get_makepkg_conf
-
-if [[ -f "${DATADIR}/setarch-aliases.d/${arch}" ]]; then
-	read -r set_arch < "${DATADIR}/setarch-aliases.d/${arch}"
-else
-	set_arch="${arch}"
-fi
-
-check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
-
-mkchrootpkg_args+=("${@:$OPTIND}")
-
-if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
-    msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"
-
-    for copy in "${chroots_pkg}/${repo}-${arch}"/*; do
-        [[ -d $copy ]] || continue
-        msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
-
-        lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
-
-        subvolume_delete_recursive "${copy}"
-        rm -rf --one-file-system "${copy}"
-    done
-    lock_close 9
-
-    rm -rf --one-file-system "${chroots_pkg}/${repo}-${arch}"
-    (umask 0022; mkdir -p "${chroots_pkg}/${repo}-${arch}")
-    setarch "${set_arch}" mkchroot \
-        -C "${pacman_conf}" \
-        -M "${makepkg_conf}" \
-        "${chroots_pkg}/${repo}-${arch}/root" \
-        "${base_devel[@]}" || abort
-else
-    lock 9 "${chroots_pkg}/${repo}-${arch}/root.lock" "Locking clean chroot"
-    chroot-run \
-        -C "${pacman_conf}" \
-        -M "${makepkg_conf}" \
-        "${chroots_pkg}/${repo}-${arch}/root" \
-        pacman -Syuu --noconfirm || abort
-fi
-
-# Always build official packages reproducibly
-if [[ ! -v SOURCE_DATE_EPOCH ]]; then
-    export SOURCE_DATE_EPOCH=$(date +%s)
-fi
-
-msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
-exec mkchrootpkg -r "${chroots_pkg}/${repo}-${arch}" "${mkchrootpkg_args[@]}"

bin/pkg/buildtree.in

@@ -1,332 +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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/common.sh)
-m4_include(lib/pkg/git.sh)
-m4_include(lib/pkg/gitea.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/jenkins.sh)
-
-#{{{ new git repo
-
-subrepo_clone(){
-    local pkg="$1"
-    local org="$2"
-    local name="$3"
-
-    msg2 "Subrepo clone [%s] from (%s)" "$pkg" "$org/$name"
-    git subrepo clone "${GIT_SSH}":"$org"/"$name".git "$pkg"
-}
-
-subrepo_new(){
-    cd "${TREE_DIR_ARTIX}/${group}" || return
-
-    local org gitname
-    org=$(get_pkg_org "${package}")
-    gitname=$(get_compliant_name "${package}")
-
-    gitearepo -cr "$gitname"
-
-    add_team_to_repo "$gitname" "$org" "${team}"
-
-    subrepo_clone "${package}" "$org" "$gitname"
-
-    mkdir -p "${TREE_DIR_ARTIX}/${group}/${package}/trunk"
-
-    commit_jenkins_files "${package}"
-}
-
-#}}}
-
-#{{{ pull
-
-clone_tree(){
-    local url="$1" tree="$2" os="${3:-Artix}"
-
-    msg "Cloning %s (%s) ..." "$tree" "$os"
-
-    git clone "$url/$tree".git
-}
-
-pull_tree_arch(){
-    cd "${TREE_DIR_ARCH}" || return
-    for tree in "${ARCH_TREE[@]}";do
-        if [[ -d "${tree}" ]];then
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)" "Arch"
-            )
-        else
-            clone_tree "${HOST_TREE_ARCH}" "${tree}" "Arch"
-        fi
-    done
-}
-
-config_tree(){
-    local tree="$1"
-    cd "$tree" || return
-        git config --bool pull.rebase true
-        git config commit.gpgsign true
-        if [[ -n "${GPGKEY}" ]];then
-            git config user.signingkey "${GPGKEY}"
-        else
-            warning "No GPGKEY configured in makepkg.conf!"
-        fi
-    cd ..
-}
-
-pull_tree_artix(){
-    local repos=()
-    if ${sync_group}; then
-        repos=("${group}")
-    else
-        repos=("${ARTIX_TREE[@]}")
-    fi
-    cd "${TREE_DIR_ARTIX}" || return
-    for tree in "${repos[@]}"; do
-        if [[ -d "${tree}" ]];then
-            config_tree "${tree}"
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)"
-            )
-        else
-            clone_tree "${host_tree_artix}" "${tree}"
-            config_tree "${tree}"
-        fi
-    done
-}
-
-#}}}
-
-#{{{ patch
-
-patch_pkg(){
-    local pkgpath="$1"
-    local pkg=${pkgpath%/*}
-    pkg=${pkg##*/}
-    sed -e 's|arch-meson|artix-meson|' -i "$pkgpath"/PKGBUILD
-    case $pkg in
-        glibc)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
-                -e '/nscd.service/d' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-        linux|linux-lts)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "$pkgpath"/PKGBUILD
-            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i "$pkgpath"/config
-        ;;
-        bash)
-            msg2 "Patching %s" "$pkg"
-            # shellcheck disable=2016
-            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
-            -e "s|etc/bash.|etc/bash/|g" \
-            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
-            -i "$pkgpath"/PKGBUILD
-            ( cd "$pkgpath" || return
-                patch -Np 1 -i "${DATADIR}"/patches/artix-bash.patch
-                updpkgsums
-            )
-        ;;
-        gstreamer|gst-plugins-*|licenses)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-                -e 's|(Arch Linux)|(Artix Linux)|' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-    esac
-}
-
-#}}}
-
-#{{{ pkgbuild import
-
-sync_pkg(){
-    local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
-    local src="$1" dest="$2"
-    msg "Sync from Arch [%s] to Artix [%s]" "${src##*archlinux/}" "${dest##*artixlinux/}"
-    rsync "${rsync_args[@]}" "$src"/ "$dest"/
-}
-
-show_deps(){
-    local src="$1" archver
-
-    # shellcheck disable=1090
-    . "$src"/PKGBUILD 2>/dev/null
-
-    archver=$(get_full_version)
-
-    # shellcheck disable=2154
-    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
-    # shellcheck disable=2154
-    msg2 "pkgname: %s" "${pkgname[*]}"
-    # shellcheck disable=2154
-    [[ -n "${pkgdesc}" ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
-    # shellcheck disable=2154
-    msg2 "Arch Version: %s" "$archver"
-    # shellcheck disable=2154
-    msg2 "arch: %s" "$arch"
-    # shellcheck disable=2154
-    [[ -n ${makedepends[*]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${checkdepends[*]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${depends[*]} ]] && msg2 "depends: %s" "${depends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${optdepends[*]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
-}
-
-from_arch(){
-    cd "${TREE_DIR_ARTIX}" || return
-
-    local srcpath repo archpath artixpath
-    srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
-    [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${package}"
-
-    repo=$(find_repo "$srcpath")
-    msg "repo: %s" "${repo#*/}"
-
-    archpath=$srcpath/$repo
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
-
-    show_deps "$archpath"
-
-    if [[ -f "$artixpath"/.gitrepo ]]; then
-        artixpath="$artixpath"/trunk
-
-        if [[ -d "$artixpath" ]];then
-            sync_pkg "$archpath" "$artixpath"
-            patch_pkg "$artixpath"
-        fi
-    else
-        die "Package '%s' does not exist!" "${package}"
-    fi
-}
-
-#}}}
-
-view_build(){
-    local archpath repo
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${package}"
-    repo=$(find_repo "${archpath}")
-    archpath=$archpath/$repo
-    msg "repo: %s" "${repo#*/}"
-    show_deps "$archpath"
-}
-
-check_tree(){
-    local archpath artixpath group
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${package}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${package}"
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
-    group=${artixpath%/*}
-    msg "group: %s" "${group##*/}"
-
-    [[ -z $artixpath ]] && msg2 "exists: %s" "no"
-    [[ -n $artixpath ]] && msg2 "exists: %s" "yes"
-}
-
-sync_repos(){
-    ${sync_arch} && pull_tree_arch
-    ${sync_artix} && pull_tree_artix
-}
-
-load_makepkg_config
-
-load_valid_names
-
-testing=true
-staging=true
-unstable=false
-
-sync=false
-sync_arch=true
-sync_artix=true
-import=false
-view=false
-createnew=false
-sync_group=false
-check=false
-
-package=''
-
-team='community'
-group="${ARTIX_TREE[0]}"
-
-host_tree_artix="${GIT_SSH}:artixlinux"
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo '    -p <pkg>      Package name'
-    echo '    -t <team>     Team name (only with -n)'
-    echo '                  Possible values: core,extra,community,multilib'
-    echo "                  [default: ${team}]"
-    echo '    -g <group>    Group name, the superrepo (only with -n or -s)'
-    echo "                  [default: ${group}]"
-    echo "    -s            Clone or pull repos"
-    echo "    -a            Don't clone or pull arch repos"
-    echo "    -b            Don't clone or pull artix repos"
-    echo '    -i            Import a package from arch repos'
-    echo '    -n            New remote subrepo and clone it'
-    echo '    -v            Check if a package is in the artix tree(s)'
-    echo '    -c            View package depends'
-    echo '    -x            Exclude testing (only with -i)'
-    echo '    -y            Exclude staging (only with -i)'
-    echo '    -z            Include kde & gnome unstable (only with -i)'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='p:t:g:sinabcvxyzh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) package="$OPTARG" ;;
-        t) team="$OPTARG" ;;
-        g) group="$OPTARG"; sync_group=true ;;
-        s) sync=true ;;
-        a) sync_arch=false ;;
-        b) sync_artix=false ;;
-        i) import=true ;;
-        n) createnew=true ;;
-        c) check=true ;;
-        v) view=true ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-set_arch_repos "$testing" "$staging" "$unstable"
-
-${sync} && sync_repos
-
-${view} && view_build
-
-${check} && check_tree
-
-${import} && from_arch
-
-${createnew} && subrepo_new

bin/pkg/checkrepo.in

@@ -1,188 +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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/table.sh)
-
-#{{{ sogrep
-
-query_db() {
-    for repo in "${searchrepos[@]}"; do
-        local db
-        db=${db_cache_dir}/${linksdb_ext}/${CARCH}/${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
-}
-
-#}}}
-
-#{{{ check db
-
-is_db_entry() {
-    local pkgname="$1" repo="${REPOS[$2]}" entry
-    entry=${db_cache_dir}/${linksdb_ext}/${CARCH}/$repo/$pkgname
-
-    if [[ -d "$entry" ]];then
-        return 0
-    fi
-    return 1
-}
-
-check_db(){
-    local pkgpath="${1%/*}"
-
-    for repo in "${!REPOS[@]}"; do
-        local pkgbuild artixver
-        [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]] && pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-$CARCH/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-$CARCH/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-any/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-any/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
-    done
-}
-
-#}}}
-
-show_lib_table() {
-    msg_table_header "${tableQ}" "Repo" "Package" "Library"
-    query_db
-}
-
-show_db_table(){
-    msg_table_header "${tableU}" "Repo" "Package" "Version" "Database"
-    tree_loop check_db
-}
-
-update_db_cache(){
-    msg "Updating database cache ..."
-    local cachedir url
-    for repo in "${searchrepos[@]}"; do
-        cachedir=${db_cache_dir}/${linksdb_ext}/${CARCH}/${repo}
-        rm -rf "$cachedir"
-        mkdir -p "$cachedir"
-        msg2 "%s" "$repo"
-        url=${REPOS_MIRROR}/${repo}/os/${CARCH}/${repo}.${linksdb_ext}
-        curl -L -s "$url" | bsdtar -xf - -C "$cachedir"
-    done
-    msg "Done"
-}
-
-db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
-
-linksdb_ext="links.tar.${DBEXT}"
-
-load_makepkg_config
-
-sync=false
-check=false
-query=false
-all_db=false
-
-readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-45s %s"
-
-load_valid_names
-
-#{{{ repo names arrays
-
-declare -A REPOS=(
-    [${valid_names[0]}]=system
-    [${valid_names[1]}]=world
-    [${valid_names[2]}]=galaxy
-    [${valid_names[3]}]=lib32
-    [${valid_names[4]}]=gremlins
-    [${valid_names[5]}]=galaxy-gremlins
-    [${valid_names[6]}]=lib32-gremlins
-    [${valid_names[7]}]=goblins
-    [${valid_names[8]}]=galaxy-goblins
-    [${valid_names[9]}]=lib32-goblins
-    [${valid_names[11]}]=kde-wobble
-    [${valid_names[12]}]=gnome-wobble
-)
-
-searchrepos=(
-    "${REPOS[${valid_names[11]}]}"
-    "${REPOS[${valid_names[12]}]}"
-    "${REPOS[${valid_names[7]}]}"
-    "${REPOS[${valid_names[8]}]}"
-    "${REPOS[${valid_names[9]}]}"
-    "${REPOS[${valid_names[4]}]}"
-    "${REPOS[${valid_names[5]}]}"
-    "${REPOS[${valid_names[6]}]}"
-    "${REPOS[${valid_names[0]}]}"
-    "${REPOS[${valid_names[1]}]}"
-    "${REPOS[${valid_names[2]}]}"
-    "${REPOS[${valid_names[3]}]}"
-)
-
-#}}}
-
-usage() {
-    echo "Usage: ${0##*/} [options] (with -q [libname])"
-    echo '    -r <repo>     Repo name to query'
-    echo '                  [default: all]'
-    echo "    -s            Sync repo databases"
-    echo '    -c            Check repos'
-    echo '    -a            Show repo db (-c)'
-    echo "    -q            Query repo databases for so libs"
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='r:qcsah'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) searchrepos=("$OPTARG") ;;
-        s) sync=true ;;
-        c) check=true ;;
-        a) all_db=true ;;
-        q) query=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-library="$1"; shift
-
-${sync} && update_db_cache
-
-${check} && show_db_table
-
-${query} && show_lib_table

bin/pkg/commitpkg.in

@@ -1,260 +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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/common.sh)
-m4_include(lib/pkg/git.sh)
-m4_include(lib/pkg/gitea.sh)
-m4_include(lib/pkg/repo.sh)
-
-#{{{ functions
-
-push_tree(){
-    local tree="$1"
-    msg "Update (%s)" "${tree}"
-    git push origin master
-}
-
-subrepo_push(){
-    local pkg="$1"
-    msg2 "Subrepo push (%s)" "$pkg"
-    git subrepo push "$pkg" || die "%s push failed" "$pkg"
-}
-
-subrepo_clean(){
-    local pkg="$1"
-    msg2 "Subrepo clean (%s)" "$pkg"
-    git subrepo clean "$pkg"
-}
-
-subrepo_pull(){
-    local pkg="$1"
-    msg2 "Subrepo pull (%s)" "$pkg"
-    git subrepo pull "$pkg"
-}
-
-prepare_commit(){
-    # create new layout, copy & remove repos
-    if [[ -d repos ]]; then
-        msg2 "Switching to new layout ..."
-        [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-
-        for r in repos/*; do
-            local name noarch
-            name=${r#*/}
-            noarch=${name%-*}
-            mkdir "$CARCH/${noarch}"
-            cp repos/"${name}"/* "$CARCH/${noarch}/"
-            git add "$CARCH/${noarch}"
-        done
-
-        git rm -r repos
-        git commit -m "switch to new repo layout"
-        msg2 "Done switch"
-    fi
-
-    if [[ $action == 'add' ]] || [[ $action == 'move' ]] ;then
-        [[ -d "$CARCH/${repo_dest}" ]] && git rm -r "$CARCH/${repo_dest}"
-        [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-        [[ ! -d "$CARCH/${repo_dest}" ]] && mkdir "$CARCH/${repo_dest}"
-    fi
-}
-
-check_rebuild(){
-    if [[ -d "$CARCH"/"${valid_names[10]}" ]] \
-    && [[ "${repo_dest}" == "${valid_names[7]}" ]]; then
-        git rm -r "$CARCH"/"${valid_names[10]}"
-        git commit -m "switch from ${valid_names[10]} to ${valid_names[7]}"
-    elif [[ -d "$CARCH"/"${valid_names[7]}" ]] \
-    && [[ "${repo_dest}" == "${valid_names[10]}" ]]; then
-        git rm -r "$CARCH"/"${valid_names[7]}"
-        git commit -m "switch from ${valid_names[7]} to ${valid_names[10]}"
-    fi
-}
-
-check_team(){
-    if [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[1]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[1]}" && "${repo_dest}" == "${valid_names[0]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[1]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[1]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[0]}" && "${repo_dest}" == "${valid_names[2]}" ]] || \
-        [[ "${repo_src}" == "${valid_names[2]}" && "${repo_dest}" == "${valid_names[0]}" ]]; then
-
-        local org gitname
-        org=$(get_pkg_org "${package}")
-        gitname=$(get_compliant_name "${package}")
-        add_team_to_repo "$gitname" "${org}" "${repo_dest}"
-        remove_team_from_repo "$gitname" "${org}" "${repo_src}"
-    fi
-}
-
-path_config() {
-    [[ "${repo_src}" != 'trunk' ]] && pkgbuild="$CARCH/${repo_src}"/PKGBUILD
-
-    if [[ ! -f "$pkgbuild" ]]; then
-        pkgbuild=repos/"${repo_src}-${CARCH}"/PKGBUILD
-        [[ -f repos/"${repo_src}"-any/PKGBUILD ]] && pkgbuild=repos/"${repo_src}"-any/PKGBUILD
-    fi
-
-    # shellcheck disable=1090
-    . "$pkgbuild"
-}
-
-get_repo_commit_msg() {
-    echo "[${repo_src}] -> [${repo_dest}] '${package}-$(get_full_version)' ${action}"
-}
-
-get_commit_msg() {
-    echo "[${repo_src}] '${package}-$(get_full_version)' ${action}"
-}
-
-commit_pkg() {
-    local commit_msg pkg
-    if ${remove}; then
-        action='remove'
-        commit_msg=$(get_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        if [[ "${repo_src}" == 'trunk' ]];then
-            git rm -r trunk
-        else
-            prepare_commit
-            git rm -r "$CARCH/${repo_src}"
-        fi
-    else
-        action='modify'
-        commit_msg=$(get_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        git add .
-    fi
-    git commit -m "$commit_msg"
-}
-
-repo_commit_pkg() {
-    local commit_msg
-    if [[ "${repo_src}" == 'trunk' ]]; then
-        action='add'
-        commit_msg=$(get_repo_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        prepare_commit
-        check_rebuild
-        cp trunk/* "$CARCH/${repo_dest}"/
-    else
-        action='move'
-        [[ ! -f $pkgbuild ]] && die "%s does not exist!" "$pkgbuild"
-        commit_msg=$(get_repo_commit_msg)
-        msg "Action: %s" "$commit_msg"
-        prepare_commit
-        cp "$CARCH/${repo_src}"/* "$CARCH/${repo_dest}"/
-        git rm -r "$CARCH/${repo_src}"
-    fi
-    git add .
-    git commit -m "$commit_msg"
-}
-
-run(){
-    local artixpath head group
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
-    if [[ -n ${artixpath} ]];then
-        group=${artixpath%/*}
-        cd "${group}" || return
-        head=$(get_local_head)
-
-        cd "${artixpath}" || return
-
-        path_config
-
-        if [[ "${cmd}" == 'commitpkg' ]];then
-            commit_pkg
-        else
-            repo_commit_pkg
-        fi
-
-        cd "${group}" || return
-
-        ${push} && pull_tree "${group##*/}" "$head"
-#         subrepo_pull "${package}"
-        subrepo_push "${package}"
-        subrepo_clean "${package}"
-
-        ${push} && push_tree "${group##*/}"
-
-        git prune
-
-        [[ "${cmd}" != 'commitpkg' ]] && check_team
-    else
-        die "Package '%s' does not exist!" "${package}"
-    fi
-}
-
-is_valid_repo(){
-    local _valid=trunk
-    for repo in "${valid_names[@]}"; do
-        _valid=${repo:-}${repo:+|}$_valid
-    done
-    eval "case ${repo_src} in
-        ${_valid}) return 0 ;;
-        *) return 1 ;;
-    esac"
-}
-
-#}}}
-
-load_makepkg_config
-
-load_valid_names
-
-repo_src='trunk'
-package=''
-remove=false
-push=false
-
-pkgbuild=trunk/PKGBUILD
-
-cmd=${0##*/}
-repo_dest=${cmd%pkg}
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -s <name>          Source repository [default:${repo_src}]"
-    echo '    -p <pkg>           Package name'
-    echo '    -r                 Delete from repo (commitpkg only)'
-    echo '    -u                 Push'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='p:s:urh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        s) repo_src="$OPTARG" ;;
-        p) package="$OPTARG" ;;
-        r) remove=true ;;
-        u) push=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-if is_valid_repo;then
-    run
-else
-    die "source repository '%s' is not valid!" "${repo_src}"
-fi

bin/pkg/comparepkg.in

@@ -1,204 +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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/table.sh)
-
-
-#{{{ upgrades, downgrades, moves
-
-remove_list(){
-    local name="$1"
-    [[ -f "${TREE_DIR_ARTIX}"/$name.list ]] && rm "${TREE_DIR_ARTIX}"/"$name".list
-}
-
-write_list(){
-    local line="$1" name="$2"
-    printf "%s\n" "$line" >> "${TREE_DIR_ARTIX}"/"$name".list
-}
-
-compare_m(){
-    case ${artixrepo} in
-        *testing*|*staging*|*rebuild)
-            if [[ "${a}" == "${b}" ]]; then
-                msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-            elif [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
-                msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-            else
-                msg_row_green "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-                if [[ -n "$archrepo" ]]; then
-                    write_list "${a}:${b}:$pkg" pkg_moves
-                else
-                    write_list "@repo@:${b}:$pkg" artix
-                fi
-            fi
-        ;;
-    esac
-}
-
-compare_u(){
-    if [ "$result" -eq -1 ];then
-        msg_row_red "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        write_list "${a}:$pkg" pkg_upgrades
-    fi
-}
-
-compare_d(){
-    if [ "$result" -eq 1 ];then
-        if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
-            msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        fi
-    fi
-}
-
-get_archpath(){
-    local pkg="$1" archpath
-
-    for tree in "${ARCH_TREE[@]}"; do
-        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
-    done
-    echo "$archpath"
-}
-
-pre_compare(){
-    local func="$1" pkgpath="$2" result group pkg
-    group="${pkgpath%/*}"
-    group=${group##*/}
-    pkg=${pkgpath##*/}
-
-    local artixrepo archrepo pkgbuild artixver archver archpath node a b
-    artixrepo=$(find_repo "$pkgpath")
-    pkgbuild=$pkgpath/$artixrepo/PKGBUILD
-
-    if [[ -f $pkgbuild ]]; then
-        # shellcheck disable=1090
-        . "$pkgbuild" 2>/dev/null
-        artixver=$(get_full_version)
-        archpath=$(get_archpath "$pkg")
-        archrepo=$(find_repo "${archpath}")
-        pkgbuild=$archpath/$archrepo/PKGBUILD
-        node=${artixrepo%/*}
-        a=${archrepo#*/} b=${artixrepo#*/}
-        a="${a%-*}"
-
-        [[ "$node" != "$CARCH" ]] && b=${b%-*}
-
-        if [[ -f "$pkgbuild" ]]; then
-            # shellcheck disable=1090
-            . "$pkgbuild" 2>/dev/null
-            archver=$(get_full_version)
-        fi
-
-        result=$(vercmp "$artixver" "$archver")
-
-        "$func"
-
-        unset epoch
-    fi
-}
-
-compare_upgrades(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_u "$pkgpath"
-}
-
-compare_downgrades(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_d "$pkgpath"
-}
-
-compare_move(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_m "$pkgpath"
-}
-
-#}}}
-
-show_compare_header(){
-    msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
-}
-
-show_upgrades_table(){
-    show_compare_header
-    remove_list pkg_upgrades
-    tree_loop compare_upgrades
-}
-
-show_downgrades_table(){
-    show_compare_header
-    tree_loop compare_downgrades
-}
-
-show_move_table(){
-    show_compare_header
-    remove_list pkg_moves
-    remove_list artix
-    tree_loop compare_move
-}
-
-load_makepkg_config
-
-load_valid_names
-
-testing=true
-staging=true
-unstable=false
-
-upgrades=false
-downgrades=false
-move=false
-
-readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo '    -u            Show upgrade packages'
-    echo '    -d            Show downgrade packages'
-    echo '    -m            Show packages to move'
-    echo "    -x            Don't inlcude testing packages"
-    echo "    -y            Don't inlcude staging packages"
-    echo '    -z            Include unstable kde and gnome'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='udmxyzh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        u) upgrades=true ;;
-        d) downgrades=true ;;
-        m) move=true ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-set_arch_repos "$testing" "$staging" "$unstable"
-
-${move} && show_move_table
-
-${upgrades} && show_upgrades_table
-
-${downgrades} && show_downgrades_table

bin/pkg/deploypkg.in

@@ -1,101 +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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/deploy.sh)
-
-#{{{ deploy
-
-add(){
-    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
-        msg "Found: %s" "${pkgfile}"
-        packages+=("${pkgname}")
-        action='add'
-        ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
-    fi
-}
-
-remove(){
-    packages+=("$(get_pkgbasename "${pkgname}")")
-    action='remove'
-    rm -v "$repo_path"/"${pkgname}"{,.sig}
-}
-
-repo_action(){
-    local packages=() action func="$1"
-    for pkgname in "${passfiles[@]}"; do
-        "$func"
-    done
-    cd "$repo_path" || return
-    if [[ -n "${action}" ]]; then
-        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
-        ${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
-    fi
-}
-
-#}}}
-
-load_makepkg_config
-
-pkgdb_ext="db.tar.${DBEXT}"
-linksdb_ext="links.tar.${DBEXT}"
-
-add_pkg=false
-rm_pkg=false
-linksdb=false
-
-cmd=${0##*/}
-dest_repo=${cmd#*-}
-
-usage() {
-    echo "Usage: ${cmd} [options]"
-    echo '    -d <dest>          Destination repository'
-    echo '    -a                 Add package(s) to repository'
-    echo '    -r                 Remove package(s) from repository'
-    echo '    -l                 Use links db'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='arlhd:'
-
-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 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-passfiles=("$@")
-
-repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
-
-if [[ -n "${passfiles[*]}" ]]; then
-    if ${add_pkg}; then
-        repo_action add
-    fi
-    if ${rm_pkg}; then
-        repo_action remove
-    fi
-fi

bin/pkg/gitearepo.in

@@ -1,89 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-21 artoo@artixlinux.org
-# 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.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/common.sh)
-
-#{{{ functions
-
-create_repo() {
-    local name="$1"
-    local org="$2"
-    local json url
-
-    json="{ \"auto_init\": true, \"name\":\"$name\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
-
-    url="${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}"
-
-    msg2 "Create package repo [%s] in org (%s)" "$name" "$org"
-
-    api_post "$url" -H "accept: application/json" \
-                    -H "content-type: application/json" \
-                    -d "$json"
-}
-
-transfer_repo() {
-    local name="$1"
-    local old_owner="$2"
-    local new_owner="landfill" json url
-    local json url
-
-    json="{  \"new_owner\": \"$new_owner\",  \"team_ids\": []}"
-
-    url="${GIT_URL}/api/v1/repos/$old_owner/$name/transfer?access_token=${GIT_TOKEN}"
-
-    msg2 "Transfer package repo [%s] in org (%s)" "$name" "$new_owner"
-
-    api_post "$url" -H  "accept: application/json" \
-                    -H  "Content-Type: application/json" \
-                    -d "$json"
-}
-
-#}}}
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo '    -r <repo>     Repo name'
-    echo '    -c            Create git repo'
-    echo '    -t            Transfer git repo to landfill org'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-create=false
-transfer=false
-
-opts='r:cth'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) repo="$OPTARG" ;;
-        c) create=true ;;
-        t) transfer=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-org=$(get_pkg_org "${repo}")
-
-${create} && create_repo "${repo}" "${org}"
-
-${transfer} && transfer_repo "${repo}" "${org}"

bin/pkg/links-add.in

@@ -1,512 +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/>.
-
-m4_include(lib/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
-            echo "$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=$(echo "$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; echo "$$" > "$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
-
-    echo
-    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

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

@@ -0,0 +1,20 @@
+#!/hint/bash
+# shellcheck disable=2034
+
+#############################################
+################ artools-pkg ################
+#############################################
+
+# gitea user access token for buildtree
+# GIT_TOKEN=''
+
+# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
+
+# 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/makepkg/x86_64.conf

@@ -11,10 +11,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -45,13 +45,14 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
         -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-#RUSTFLAGS="-C opt-level=2"
+LTOFLAGS="-flto=auto"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_CFLAGS="-g"
+DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -93,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)

config/pacman/default.conf

@@ -70,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[gremlins]
+#[system-gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+#[world-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 

config/pacman/goblins.conf

@@ -70,18 +70,21 @@ LocalFileSigLevel = Optional
 # 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]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[gremlins]
+[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
 

config/pacman/gremlins.conf

@@ -70,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 

config/pacman/lib32-goblins.conf

@@ -70,15 +70,21 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[goblins]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[gremlins]
+[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
 

config/pacman/lib32-gremlins.conf

@@ -70,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 

config/pacman/lib32.conf

@@ -70,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[gremlins]
+#[system-gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+#[world-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 

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/conf/artools-pkg.conf

@@ -1,52 +0,0 @@
-#############################################
-################ artools-pkg ################
-#############################################
-
-# gitea user access token for buildtree
-# GIT_TOKEN=''
-
-# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
-
-# customize buildtree; uncomment to include
-# TREE_NAMES_ARTIX=(
-#         packages-kernel
-#         packages-llvm
-#         packages-openrc
-#         packages-runit
-#         packages-s6
-#         packages-suite66
-#         packages-perl
-#         packages-java
-#         packages-ruby
-#         packages-kf5
-#         packages-plasma
-#         packages-kde
-#         packages-gnome
-#         packages-cinnamon
-#         packages-lxqt
-#         packages-mate
-#         packages-xfce
-#         packages-wm
-#         packages-devel
-#         packages-qt6
-#         packages-office
-#         packages-misc
-#         python-world
-#         python-galaxy
-#         packages-python
-#         packages-lib32
-# )
-
-# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
-
-# default repos root for deploypkg
-# REPOS_ROOT=${WORKSPACE_DIR}/repos
-
-# default mirror for checkrepo
-# REPOS_MIRROR="http://mirror1.artixlinux.org/repos"
-
-# enable if trouble with default github arch mirror
-# ARCH_TREE=(packages community)
-
-# enable if trouble with default github arch mirror
-# HOST_TREE_ARCH='https://git.archlinux.org/svntogit'

data/pacman/pacman-docker.conf

@@ -1,99 +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  = usr/share/help/* !usr/share/help/en*
-NoExtract  = usr/share/gtk-doc/html/* usr/share/doc/*
-NoExtract  = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
-NoExtract   = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
-NoExtract   = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
-NoExtract   = !usr/share/*locales/trans*
-NoExtract  = usr/share/man/* usr/share/info/*
-NoExtract  = usr/share/vim/vim*/lang/*
-
-# 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.
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32]
-#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/pacman-goblins.conf

@@ -1,98 +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.
-
-[goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-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/pacman-kde-wobble.conf

@@ -1,101 +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
-
-[goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-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/patches/artix-bash.patch

@@ -1,87 +0,0 @@
---- /dev/null
-+++ b/artix.bashrc
-@@ -0,0 +1,46 @@
-+use_color=true
-+
-+# Set colorful PS1 only on colorful terminals.
-+# dircolors --print-database uses its own built-in database
-+# instead of using /etc/DIR_COLORS.  Try to use the external file
-+# first to take advantage of user additions.  Use internal bash
-+# globbing instead of external grep binary.
-+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
-+match_lhs=""
-+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
-+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-+[[ -z ${match_lhs}    ]] \
-+	&& type -P dircolors >/dev/null \
-+	&& match_lhs=$(dircolors --print-database)
-+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
-+
-+if ${use_color} ; then
-+	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
-+	if type -P dircolors >/dev/null ; then
-+		if [[ -f ~/.dir_colors ]] ; then
-+			eval $(dircolors -b ~/.dir_colors)
-+		elif [[ -f /etc/DIR_COLORS ]] ; then
-+			eval $(dircolors -b /etc/DIR_COLORS)
-+		fi
-+	fi
-+
-+	if [[ ${EUID} == 0 ]] ; then
-+		PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
-+	else
-+		PS1='\[\033[01;36m\][\u@\h\[\033[01;37m\] \W\[\033[01;36m\]]\$\[\033[00m\] '
-+	fi
-+
-+	alias ls='ls --color=auto'
-+	alias grep='grep --colour=auto'
-+	alias egrep='egrep --colour=auto'
-+	alias fgrep='fgrep --colour=auto'
-+else
-+	if [[ ${EUID} == 0 ]] ; then
-+		# show root@ when we don't have colors
-+		PS1='\u@\h \W \$ '
-+	else
-+		PS1='\u@\h \w \$ '
-+	fi
-+fi
-+
-+unset use_color safe_term match_lhs sh
---- a/dot.bashrc
-+++ b/dot.bashrc
-@@ -5,5 +5,5 @@
- # If not running interactively, don't do anything
- [[ $- != *i* ]] && return
-
--alias ls='ls --color=auto'
--PS1='[\u@\h \W]\$ '
-+# alias ls='ls --color=auto'
-+# PS1='[\u@\h \W]\$ '
-
---- a/system.bashrc
-+++ a/system.bashrc
-@@ -1,5 +1,5 @@
- #
--# /etc/bash.bashrc
-+# /etc/bash/bashrc
- #
-
- # If not running interactively, don't do anything
-@@ -19,4 +19,8 @@
-     ;;
- esac
-
-+for sh in /etc/bash/bashrc.d/*.bashrc ; do
-+	[[ -r ${sh} ]] && source "${sh}"
-+done
-+
- [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
-
---- a/system.bash_logout
-+++ a/system.bash_logout
-@@ -1,3 +1,3 @@
- #
--# /etc/bash.bash_logout
-+# /etc/bash/bash_logout
- #
-

data/valid-names.conf

@@ -1,42 +0,0 @@
-#!/hint/bash
-
-valid_names=(
-    core
-    extra
-    community
-    multilib
-    testing
-    community-testing
-    multilib-testing
-    staging
-    community-staging
-    multilib-staging
-    rebuild
-    gnome-unstable
-    kde-unstable
-)
-
-stable=(
-    "${valid_names[0]}"
-    "${valid_names[1]}"
-    "${valid_names[2]}"
-    "${valid_names[3]}"
-)
-
-gremlins=(
-    "${valid_names[4]}"
-    "${valid_names[5]}"
-    "${valid_names[6]}"
-)
-
-goblins=(
-    "${valid_names[7]}"
-    "${valid_names[8]}"
-    "${valid_names[9]}"
-    "${valid_names[10]}"
-)
-
-wobble=(
-    "${valid_names[11]}"
-    "${valid_names[12]}"
-)

lib/base/chroot-version.sh

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

lib/base/common.sh

@@ -1,16 +0,0 @@
-#!/hint/bash
-
-#{{{ common
-
-get_makepkg_conf() {
-    makepkg_conf="${DATADIR}/makepkg.conf"
-    [[ -f ${USER_CONF_DIR}/makepkg.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf"
-}
-
-get_pacman_conf() {
-    local repo="$1"
-    pacman_conf="${DATADIR}/pacman-${repo}.conf"
-    [[ -f "${USER_CONF_DIR}/pacman-${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman-${repo}.conf"
-}
-
-#}}}

lib/pkg/common.sh

@@ -1,36 +0,0 @@
-#!/hint/bash
-
-#{{{ common functions
-
-get_compliant_name(){
-    local gitname="$1"
-    case "$gitname" in
-        *+) gitname=${gitname//+/plus}
-    esac
-    echo "$gitname"
-}
-
-get_pkg_org(){
-    local pkg="$1" org sub
-    case ${pkg} in
-        ruby-*) org="packagesRuby" ;;
-        perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
-        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
-    esac
-    echo "$org"
-}
-
-api_put() {
-    curl -s -X PUT "$@"
-}
-
-api_delete() {
-    curl -s -X DELETE "$@"
-}
-
-api_post() {
-    curl -s -X POST "$@"
-}
-
-#}}}

lib/pkg/git.sh

@@ -1,35 +0,0 @@
-#!/hint/bash
-
-#{{{ git
-
-get_local_head(){
-    git log --pretty=%H ...refs/heads/master^ | head -n 1
-}
-
-get_remote_head(){
-    git ls-remote origin -h refs/heads/master | cut -f1
-}
-
-has_changeset(){
-    local head_l="$1" head_r="$2"
-    if [[ "$head_l" == "$head_r" ]]; then
-        msg2 "remote changes: no"
-        return 1
-    else
-        msg2 "remote changes: yes"
-        return 0
-    fi
-}
-
-pull_tree(){
-    local tree="$1" local_head="$2" os="${3:-Artix}"
-    local remote_head
-    remote_head=$(get_remote_head)
-
-    msg "Checking (%s) (%s)" "${tree}" "$os"
-    if has_changeset "${local_head}" "${remote_head}";then
-        git pull origin master
-    fi
-}
-
-#}}}

lib/pkg/gitea.sh

@@ -1,31 +0,0 @@
-#!/hint/bash
-
-#{{{ gitea api
-
-add_team_to_repo() {
-    local name="$1"
-    local org="$2"
-    local team="$3"
-    local url
-
-    url="${GIT_URL}/api/v1/repos/$org/$name/teams/$team?access_token=${GIT_TOKEN}"
-
-    msg2 "Adding team (%s) to package repo [%s]" "$team" "$name"
-
-    api_put "$url" -H  "accept: application/json"
-}
-
-remove_team_from_repo() {
-    local name="$1"
-    local org="$2"
-    local team="$3"
-    local url
-
-    url="${GIT_URL}/api/v1/repos/$org/$name/teams/$team?access_token=${GIT_TOKEN}"
-
-    msg2 "Removing team (%s) from package repo [%s]" "$team" "$name"
-
-    api_delete "$url" -H  "accept: application/json"
-}
-
-#}}}

lib/pkg/jenkins.sh

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

lib/pkg/repo.sh

@@ -1,51 +0,0 @@
-#!/hint/bash
-
-##{{{ repo
-
-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
-}
-
-set_arch_repos(){
-    local _testing="$1" _staging="$2" _unstable="$3"
-    [[ -z ${valid_names[*]} ]] && load_valid_names
-    ARCH_REPOS=("${stable[@]}")
-    $_testing && ARCH_REPOS+=("${gremlins[@]}")
-    $_staging && ARCH_REPOS+=("${goblins[@]}")
-    $_unstable && ARCH_REPOS+=("${wobble[@]}")
-}
-
-find_repo(){
-    local pkg="$1" pkgarch="${2:-${CARCH}}" repo
-    for r in "${ARCH_REPOS[@]}"; do
-        [[ -f $pkg/repos/$r-$pkgarch/PKGBUILD ]] && repo=repos/"$r-$pkgarch"
-        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
-        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
-    done
-    echo "$repo"
-}
-
-find_pkg(){
-    local searchdir="$1" pkg="$2" result
-    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    echo "$result"
-}
-
-tree_loop(){
-    local func="$1" pkgs
-    for tree in "${ARTIX_TREE[@]}"; do
-        pkgs=$(find "${TREE_DIR_ARTIX}/$tree" -name repos -o -name "$CARCH" | sort)
-        for _package in ${pkgs}; do
-            "$func" "$_package"
-        done
-    done
-}
-
-#}}}

lib/util-pkg.sh

@@ -1,75 +0,0 @@
-#!/hint/bash
-
-#{{{ pkg conf
-
-load_pkg_config(){
-
-    local conf="$1/artools-pkg.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    # shellcheck source=/etc/artools/artools-pkg.conf
-    [[ -r "$conf" ]] && . "$conf"
-
-    local git_domain="gitea.artixlinux.org"
-
-    GIT_URL=${GIT_URL:-"https://${git_domain}"}
-
-    GIT_SSH=${GIT_SSH:-"gitea@${git_domain}"}
-
-    GIT_TOKEN=${GIT_TOKEN:-''}
-
-    TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
-
-    ARTIX_TREE=(
-        packages community
-        packages-{gfx,gtk,media,net,qt5,xorg}
-    )
-
-    local dev_tree=(
-        packages-{llvm,python,perl,java,ruby}
-        python-{world,galaxy}
-    )
-
-    local init_tree=(packages-{openrc,runit,s6,suite66,dinit})
-
-    local desktop_tree=(
-        packages-{kf5,plasma,kde,qt6}
-        packages-{lxqt,gnome,cinnamon,mate,xfce,wm}
-    )
-
-    [[ -z ${TREE_NAMES_ARTIX[*]} ]] && \
-    TREE_NAMES_ARTIX=(
-        packages-kernel
-        "${init_tree[@]}"
-        "${dev_tree[@]}"
-        "${desktop_tree[@]}"
-        packages-devel
-        packages-lib32
-    )
-
-    ARTIX_TREE+=("${TREE_NAMES_ARTIX[@]}")
-
-    TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
-
-    [[ -z ${ARCH_TREE[*]} ]] && \
-    ARCH_TREE=(svntogit-{packages,community})
-
-    REPOS_ROOT=${REPOS_ROOT:-"${WORKSPACE_DIR}/repos"}
-
-    REPOS_MIRROR=${REPOS_MIRROR:-'http://mirror1.artixlinux.org/repos'}
-
-    HOST_TREE_ARCH=${HOST_TREE_ARCH:-'https://github.com/archlinux'}
-
-    DBEXT=${DBEXT:-'gz'}
-
-    return 0
-}
-
-#}}}
-
-load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"
-
-prepare_dir "${REPOS_ROOT}"
-prepare_dir "${TREE_DIR_ARTIX}"
-prepare_dir "${TREE_DIR_ARCH}"

src/base/artix-chroot.in

@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+shopt -s extglob
+
+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() {
+    printf 'usage: %s chroot-dir [command]\n' "${0##*/}"
+    printf '    -h             Print this help message\n'
+    printf '\n'
+    printf "    If 'command' is unspecified, %s will launch /bin/sh.\n" "${0##*/}"
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+orig_args=("$@")
+
+opts=':h'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+
+chrootdir=$1
+shift
+
+[[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
+
+chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
+chroot_add_resolv_conf "${chrootdir}"
+
+SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "$@"

src/base/basestrap.in

@@ -1,16 +1,6 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #
 # Assumptions:
@@ -22,9 +12,14 @@
 
 shopt -s extglob
 
-m4_include(lib/base/message.sh)
-m4_include(lib/base/mount.sh)
-m4_include(lib/base/chroot.sh)
+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
 
@@ -55,22 +50,24 @@ copymirrorlist=1
 pacmode=-Sy
 
 usage() {
-    echo "usage: ${0##*/} [options] root [packages...]"
-    echo " -C <config>      Use an alternate config file for pacman"
-    echo " -c               Use the package cache on the host, rather than the target"
-    echo " -G               Avoid copying the host's pacman keyring to the target"
-    echo " -i               Avoid auto-confirmation of package selections"
-    echo " -M               Avoid copying the host's mirrorlist to the target"
-    echo ' -U               Use pacman -U to install packages'
-    echo " -h               Print this help message"
-    echo ''
-    echo ' basestrap installs packages to the specified new root directory.'
-    echo ' If no packages are given, basestrap defaults to the "base" group.'
-    echo ''
-    echo ''
+    printf "usage: %s [options] root [packages...]\n" "${0##*/}"
+    printf " -C <config>      Use an alternate config file for pacman\n"
+    printf " -c               Use the package cache on the host, rather than the target\n"
+    printf " -G               Avoid copying the host's pacman keyring to the target\n"
+    printf " -i               Avoid auto-confirmation of package selections\n"
+    printf " -M               Avoid copying the host's mirrorlist to the target\n"
+    printf ' -U               Use pacman -U to install packages\n'
+    printf " -h               Print this help message\n"
+    printf '\n'
+    printf ' basestrap installs packages to the specified new root directory.\n'
+    printf ' If no packages are given, basestrap defaults to the "base" group.\n'
+    printf '\n'
+    printf '\n'
     exit "$1"
 }
 
+orig_args=("$@")
+
 opts=':C:cGiMU'
 
 while getopts ${opts} arg; do
@@ -81,13 +78,12 @@ while getopts ${opts} arg; do
         G) copykeyring=0 ;;
         M) copymirrorlist=0 ;;
         U) pacmode=-U ;;
-        :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
-        ?) usage 0 ;;
+        h|?) usage 0 ;;
     esac
 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,29 +1,25 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
-m4_include(lib/base/mount.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/chroot-version.sh)
+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
+
+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 [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
+        if [[ -n "$flink" ]]; then
+            if [[ "${flink:0:${#prefix}}" == "$prefix" ]]; then
                 # this process is in the chroot...
                 pid=$(basename "$(dirname "$root_dir")")
                 name=$(ps -p "$pid" -o comm=)
@@ -45,21 +41,23 @@ files=()
 mount_args=("-B:/etc/hosts:/etc/hosts")
 
 usage() {
-    echo "Usage: ${0##*/} [options] working-dir [run arguments]"
-    echo "A wrapper around chroot. Provides support for pacman."
-    echo
-    echo ' options:'
-    echo '    -C <file>     Location of a pacman config file'
-    echo '    -M <file>     Location of a makepkg config file'
-    echo '    -c <dir>      Set pacman cache'
-    echo '    -f <file>     Copy file from the host to the chroot'
-    echo '    -s            Do not run setarch'
-    echo '    -b <list>     Bind mountargs'
-    echo '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]'
-    echo '    -h            This message'
+    printf "Usage: %s [options] working-dir [run arguments]\n" "${0##*/}"
+    printf "A wrapper around chroot. Provides support for pacman.\n"
+    printf '\n'
+    printf ' options:\n'
+    printf '    -C <file>     Location of a pacman config file\n'
+    printf '    -M <file>     Location of a makepkg config file\n'
+    printf '    -c <dir>      Set pacman cache\n'
+    printf '    -f <file>     Copy file from the host to the chroot\n'
+    printf '    -s            Do not run setarch\n'
+    printf '    -b <list>     Bind mountargs\n'
+    printf '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]\n'
+    printf '    -h            This message\n'
     exit 1
 }
 
+orig_args=("$@")
+
 opts='hC:M:c:b:f:s'
 
 while getopts ${opts} arg; do
@@ -69,42 +67,39 @@ 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 ;;
-        *) error "invalid argument '$arg'"; usage ;;
     esac
 done
 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
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
 if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+    mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
 
 # shellcheck disable=2016
-host_mirrors=($("$pacconf_cmd" --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
         # shellcheck disable=2016
-        host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+        host_mirror=$(printf "%s\n" "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
         in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
     fi
 done
 
 while read -r line; do
     # shellcheck disable=2016
-    mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
+    mapfile -t lines < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
         --repo "$line" Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
     for line in "${lines[@]}"; do
         if [[ $line = file://* ]]; then
@@ -112,7 +107,7 @@ while read -r line; do
             in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
         fi
     done
-done < <("$pacconf_cmd" --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
+done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
 
 copy_hostconf () {
     unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
@@ -143,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
@@ -168,10 +166,10 @@ eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
 [[ -z $nosetarch ]] || unset CARCH
 
-if [[ -f "@datadir@/artools/setarch-aliases.d/${CARCH}" ]]; then
-	read -r set_arch < "@datadir@/artools/setarch-aliases.d/${CARCH}"
+if [[ -f "/usr/share/artools/artools/setarch-aliases.d/${CARCH}" ]]; then
+    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,20 +1,13 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 shopt -s extglob
 
-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
 
 #{{{ filesystems
 
@@ -352,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...
@@ -417,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,20 +1,19 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/chroot-version.sh)
+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
+
+CHROOTVERSION=@chrootver@
+
+# umask might have been changed in /etc/profile
+# ensure that sane default is set again
+umask 0022
 
 working_dir=''
 umode=''
@@ -23,18 +22,20 @@ files=()
 chroot_args=()
 
 usage() {
-    echo "Usage: ${0##*/} [options] working-dir package-list..."
-    echo ' options:'
-    echo '    -U            Use pacman -U to install packages'
-    echo '    -C <file>     Location of a pacman config file'
-    echo '    -M <file>     Location of a makepkg config file'
-    echo '    -c <dir>      Set pacman cache'
-    echo '    -f <file>     Copy file from the host to the chroot'
-    echo '    -s            Do not run setarch'
-    echo '    -h            This message'
+    printf "Usage: %s [options] working-dir package-list...\n" "${0##*/}"
+    printf ' options:\n'
+    printf '    -U            Use pacman -U to install packages\n'
+    printf '    -C <file>     Location of a pacman config file\n'
+    printf '    -M <file>     Location of a makepkg config file\n'
+    printf '    -c <dir>      Set pacman cache\n'
+    printf '    -f <file>     Copy file from the host to the chroot\n'
+    printf '    -s            Do not run setarch\n'
+    printf '    -h            This message\n'
     exit 1
 }
 
+orig_args=("$@")
+
 opts='hUC:M:c:f:s'
 
 while getopts ${opts} arg; do
@@ -46,7 +47,6 @@ while getopts ${opts} arg; do
         f) files+=("$OPTARG") ;;
         s) nosetarch=1 ;;
         h|?) usage ;;
-        *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
     if [[ $arg != U ]]; then
         chroot_args+=("-$arg")
@@ -57,17 +57,15 @@ 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
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <($pacconf_cmd CacheDir)
+    mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi
 
 umask 0022
@@ -93,13 +91,13 @@ for f in "${files[@]}"; do
     cp "$f" "$working_dir$f"
 done
 
-basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
+unshare --mount basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
     "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
 
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
-echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
-# echo 'KEYMAP=en' > "$working_dir/etc/vconsole.conf"
-echo "${CHROOTVERSION}" > "$working_dir/.artools"
+printf 'LANG=C.UTF-8\n' > "$working_dir/etc/locale.conf"
+# printf 'KEYMAP=en\n' > "$working_dir/etc/vconsole.conf"
+printf "%s\n" "${CHROOTVERSION}" > "$working_dir/.artools"
 
 dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 

src/iso/buildiso.in

@@ -1,35 +1,45 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/util-base.sh)
-m4_include(lib/util-iso.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/base/common.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/iso/mount.sh)
-m4_include(lib/iso/services.sh)
-m4_include(lib/base/yaml.sh)
-m4_include(lib/iso/calamares.sh)
-m4_include(lib/iso/config.sh)
-m4_include(lib/iso/firmware.sh)
-m4_include(lib/iso/dracut.sh)
-m4_include(lib/iso/initcpio.sh)
-m4_include(lib/iso/grub.sh)
-m4_include(lib/iso/squash.sh)
-m4_include(lib/iso/iso.sh)
-m4_include(lib/iso/profile.sh)
-m4_include(lib/iso/trap.sh)
+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/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(){
     local path mnt="$1"
@@ -60,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
@@ -181,18 +191,18 @@ gen_iso_fn(){
     for n in "${vars[@]}"; do
         name=${name:-}${name:+-}${n}
     done
-    echo "$name"
+    printf "%s\n" "$name"
 }
 
 prepare_build(){
     load_profile
 
     case "${repo}" in
-        'gremlins'|'goblins') repo="${repo}" ;;
-        *) repo=default ;;
+        buildiso) repo=default ;;
     esac
 
-    get_pacman_conf "${repo}"
+    pacman_conf="${DATADIR}/pacman.conf.d/${repo}.conf"
+    [[ -f "${USER_CONF_DIR}/pacman.conf.d/${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman.conf.d/${repo}.conf"
 
     iso_file=$(gen_iso_fn).iso
 
@@ -242,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}"
@@ -325,31 +335,33 @@ chroots_iso="${CHROOTS_DIR}/buildiso"
 arch=$(uname -m)
 
 usage() {
-    echo "Usage: ${cmd} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
-    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
-    echo '    -t <dir>           Target directory'
-    echo "                       [default: ${ISO_POOL}]"
-    echo '    -i <name>          Init system to use'
-    echo "                       [default: ${INITSYS}]"
-    echo '    -g <key>           The gpg key for img signing'
-    echo "                       [default: none]"
-    echo '    -m                 Set SquashFS image mode to persistence'
-    echo '    -c                 Disable clean work dir'
-    echo '    -x                 Build chroot only'
-    echo '    -s                 Squash chroot only'
-    echo '    -b                 Generate iso boot only'
-    echo '    -z                 Generate iso only'
-    echo '                       Requires pre built images (-x)'
-    echo '    -d                 Use dracut instead of mkinitcpio for iso initramfs'
-    echo '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
+    printf 'Usage: %s [options]\n' "${cmd}"
+    printf '    -p <profile>       Profile [default: %s]\n' "${profile}"
+    printf '    -r <dir>           Chroots directory\n'
+    printf '                       [default: %s]\n' "${chroots_iso}"
+    printf '    -t <dir>           Target directory\n'
+    printf '                       [default: %s]\n' "${ISO_POOL}"
+    printf '    -i <name>          Init system to use\n'
+    printf '                       [default: %s]\n' "${INITSYS}"
+    printf '    -g <key>           The gpg key for img signing\n'
+    printf '                       [default: none]\n'
+    printf '    -m                 Set SquashFS image mode to persistence\n'
+    printf '    -c                 Disable clean work dir\n'
+    printf '    -x                 Build chroot only\n'
+    printf '    -s                 Squash chroot only\n'
+    printf '    -b                 Generate iso boot only\n'
+    printf '    -z                 Generate iso only\n'
+    printf '                       Requires pre built images (-x)\n'
+    printf '    -d                 Use dracut instead of mkinitcpio for iso initramfs\n'
+    printf '    -q                 Query settings and pretend build\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
     exit "$1"
 }
 
+orig_args=("$@")
+
 opts='p:r:t:i:g:czsbxmdqh'
 
 while getopts "${opts}" arg; do
@@ -368,7 +380,6 @@ while getopts "${opts}" arg; do
         d) use_dracut=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
@@ -378,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,17 +1,19 @@
 #!/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
 
-shopt -s extglob
-
-if [[ -t 2 && "$TERM" != dumb ]]; then
+if [[ -t 2 && "$TERM" != dumb ]] || [[ ${ARTOOLS_COLOR} == always ]]; then
     colorize
 else
     # shellcheck disable=2034
@@ -24,14 +26,19 @@ stat_busy() {
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
+stat_progress() {
+    # shellcheck disable=2059
+    printf "${BOLD}.${ALL_OFF}" >&2
+}
+
 stat_done() {
     # shellcheck disable=2059
     printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
 lock_close() {
-	local fd=$1
-	exec {fd}>&-
+    local fd=$1
+    exec {fd}>&-
 }
 
 lock() {
@@ -94,4 +101,28 @@ die() {
     cleanup 255
 }
 
+msg_success() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${GREEN}✓${ALL_OFF}" "${msg}" >&2
+}
+
+msg_error() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${RED}x${ALL_OFF}" "${msg}" >&2
+}
+
+msg_warn() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${YELLOW}!${ALL_OFF}" "${msg}" >&2
+}
+
 #}}}

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'
-    $os && args='--bind'
+    local mnt="$1"
     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,9 +1,13 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ base conf
 
-DATADIR=${DATADIR:-'@datadir@/artools'}
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+prepare_dir(){
+    [[ ! -d $1 ]] && mkdir -p "$1"
+    return 0
+}
 
 if [[ -n $SUDO_USER ]]; then
     eval "USER_HOME=~$SUDO_USER"
@@ -13,9 +17,7 @@ fi
 
 USER_CONF_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"
 
-prepare_dir(){
-    [[ ! -d $1 ]] && mkdir -p "$1"
-}
+prepare_dir "${USER_CONF_DIR}"
 
 load_base_config(){
 
@@ -23,8 +25,8 @@ load_base_config(){
 
     [[ -f "$conf" ]] || return 1
 
-    # shellcheck source=/etc/artools/artools-base.conf
-    [[ -r "$conf" ]] && . "$conf"
+    # shellcheck source=config/conf/artools-base.conf
+    [[ -r "$conf" ]] && source "$conf"
 
     CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
 
@@ -35,7 +37,8 @@ load_base_config(){
 
 #}}}
 
+
 load_base_config "${USER_CONF_DIR}" || load_base_config "${SYSCONFDIR}"
 
 prepare_dir "${WORKSPACE_DIR}"
-prepare_dir "${USER_CONF_DIR}"
+

src/lib/base/yaml.sh

@@ -1,13 +1,15 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ yaml
 
 write_yaml_header(){
-    printf '%s' '---'
+    printf '%s\n' '---'
 }
 
 write_empty_line(){
-    printf '\n%s\n' ' '
+    printf '\n'
 }
 
 write_yaml_map(){

src/lib/iso/calamares.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ calamares
 
@@ -13,7 +15,7 @@ write_services_conf(){
         yaml+=$(write_yaml_seq 2 "$svc")
     done
     yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
+    printf '%s\n' "${yaml}"
 }
 
 write_services_openrc_conf(){
@@ -29,6 +31,7 @@ write_services_runit_conf(){
 write_services_s6_conf(){
     local conf="$1"/services-s6.conf
     write_services_conf 'svDir' '/etc/s6/sv' 'dbDir' '/etc/s6/rc/compiled' > "$conf"
+    printf '%s\n' "defaultBundle: default" >> "$conf"
 }
 
 write_services_suite66_conf(){

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
 
@@ -10,7 +12,7 @@ prepare_initramfs_dracut(){
     printf "%s\n" 'add_dracutmodules+=" dmsquash-live"' > "$mnt"/etc/dracut.conf.d/50-live.conf
 
     msg "Starting build: %s" "${kver}"
-    artools-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
+    artix-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
     msg "Image generation successful"
 
     cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img

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
 
@@ -40,7 +42,7 @@ prepare_initramfs_mkinitcpio() {
         export ARTIX_GNUPG_FD
     fi
 
-    artools-chroot "$mnt" mkinitcpio -k "$k" \
+    artix-chroot "$mnt" mkinitcpio -k "$k" \
         -c /etc/"$mkinitcpio_conf" \
         -g /boot/initramfs.img
 

src/lib/iso/iso.sh

@@ -1,17 +1,19 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ iso
 
 get_disturl(){
     # shellcheck disable=1091
     . /usr/lib/os-release
-    echo "${HOME_URL}"
+    printf "%s\n" "${HOME_URL}"
 }
 
 get_osname(){
     # shellcheck disable=1091
     . /usr/lib/os-release
-    echo "${NAME}"
+    printf "%s\n" "${NAME}"
 }
 
 assemble_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,20 +45,22 @@ 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##*/}"
-    packages+=($(sed "$_com_rm" "$list" \
+    mapfile -t pkgs < <(sed "$_com_rm" "$list" \
             | sed "$_space" \
             | sed "$_init" \
-            | sed "$_clean"))
+            | sed "$_clean")
+
+    printf "%s\n" "${pkgs[@]}"
 }
 
 read_from_services() {
     for svc in "${SERVICES[@]}"; do
         case "$svc" in
-            sddm|gdm|lightdm|mdm|greetd|lxdm|xdm) packages+=("$svc-${INITSYS}") ;;
+            sddm|gdm|lightdm|mdm|greetd|lxdm|xdm)
+                packages+=("$svc-${INITSYS}"); display_manager="$svc" ;;
             NetworkManager) packages+=("networkmanager-${INITSYS}") ;;
             connmand) packages+=("connman-${INITSYS}") ;;
             cupsd) packages+=("cups-${INITSYS}") ;;
@@ -71,14 +75,20 @@ load_pkgs(){
     packages=()
 
     if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
-        read_from_list "${common_dir}/Packages-base"
-        read_from_list "${common_dir}/Packages-apps"
-        read_from_list "${common_dir}/Packages-${INITSYS}"
-        [[ -n "${live_list}" ]] && read_from_list "${common_dir}/Packages-xorg"
-        read_from_list "$pkglist"
+        for l in base apps "${INITSYS}"; do
+            msg2 "Loading Packages: [%s] ..." "Packages-${l}"
+            packages+=($(read_from_list "${common_dir}/Packages-${l}"))
+        done
+        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
 
@@ -23,24 +25,26 @@ add_svc_runit(){
 }
 
 add_svc_s6(){
-    local mnt="$1" names="$2" rlvl="${3:-default}" error ret
-    local db=/etc/s6/rc/compiled
+    local mnt="$1" names="$2" rlvl="${3:-default}" dep
+    dep="$mnt"/etc/s6/sv/"$display_manager"-srv/dependencies.d
     for svc in $names; do
-        error=false
-        chroot "$mnt" s6-rc-db -c "$db" type "$svc" &> /dev/null || error=true
-        ret="$?"
-        if [ $ret -eq 0 ] && [[ "$error" == false ]]; then
-            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" s6-rc-bundle-update -c "$db" add "$rlvl" "$svc"
+        msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+        chroot "$mnt" s6-service add "$rlvl" "$svc"
+        if [[ "$svc" == "$display_manager" ]]; then
+            if [[ -d "$dep" ]]; then
+                touch "$dep"/artix-live
+            fi
         fi
     done
 
-    local rlvl=/etc/s6/current
+    chroot "$mnt" s6-db-reload -r
+
+    local src=/etc/s6/current skel=/etc/s6/skel getty='/usr/bin/agetty -L -8 tty7 115200'
     # rebuild s6-linux-init binaries
-    chroot "$mnt" rm -r "$rlvl"
-    chroot "$mnt" s6-linux-init-maker -1 -N -f /etc/s6/skel -G "/usr/bin/agetty -L -8 tty7 115200" -c "$rlvl" "$rlvl"
-    chroot "$mnt" mv "$rlvl"/bin/init "$rlvl"/bin/s6-init
-    chroot "$mnt" cp -a "$rlvl"/bin /usr
+    chroot "$mnt" rm -r "$src"
+    chroot "$mnt" s6-linux-init-maker -1 -N -f "$skel" -G "$getty" -c "$src" "$src"
+    chroot "$mnt" mv "$src"/bin/init "$src"/bin/s6-init
+    chroot "$mnt" cp -a "$src"/bin /usr
 }
 
 add_svc_suite66(){

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
-    [[ -r "$conf" ]] && . "$conf"
+    # shellcheck source=config/conf/artools-iso.conf
+    [[ -r "$conf" ]] && source "$conf"
 
     ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
 

src/lib/pkg/admin.sh

@@ -0,0 +1,55 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_ADMIN_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_ADMIN_SH=1
+
+set -e
+
+artixpkg_admin_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        transfer          Clone a package repository
+
+    OPTIONS
+        -h, --help     Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} transfer libfoo libbar
+_EOF_
+}
+
+artixpkg_admin() {
+    if (( $# < 1 )); then
+        artixpkg_admin_usage
+        exit 0
+    fi
+
+    # option checking
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_admin_usage
+            exit 0
+        ;;
+        transfer)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/admin/transfer.sh
+            source "${LIBDIR}"/pkg/admin/transfer.sh
+            artixpkg_admin_transfer "$@"
+            exit 0
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            die "invalid command: %s" "$1"
+        ;;
+        esac
+    done
+}

src/lib/pkg/admin/transfer.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_ADMIN_TRANSFER_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_ADMIN_TRANSFER_SH=1
+
+set -e
+
+
+artixpkg_admin_transfer_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -h, --help             Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo
+        $ ${COMMAND} libfoo libbar
+_EOF_
+}
+
+
+
+artixpkg_admin_transfer() {
+    if (( $# < 1 )); then
+        artixpkg_admin_transfer_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+    local waste_org="landfill"
+
+    local command=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_admin_transfer_usage
+                exit 0
+            ;;
+            --)
+                shift
+                break
+            ;;
+            -*)
+                die "invalid argument: %s" "$1"
+            ;;
+            *)
+                break
+            ;;
+        esac
+    done
+
+    pkgbases+=("$@")
+
+    if [[ -n ${GIT_TOKEN} ]]; then
+        for pkgbase in "${pkgbases[@]}"; do
+            transfer_repo "${pkgbase}" "${waste_org}"
+        done
+    fi
+}

src/lib/pkg/api/gitea.sh

@@ -0,0 +1,147 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ gitea api
+
+get_compliant_name() {
+    local name=$1
+    printf "%s\n" "${name}" \
+    | sed -E 's/([a-zA-Z0-9]+)\+([a-zA-Z]+)/\1-\2/g' \
+    | sed -E 's/\+/plus/g' \
+    | sed -E 's/[^a-zA-Z0-9_\-\.]/-/g' \
+    | sed -E 's/[_\-]{2,}/-/g'
+}
+
+api_put() {
+    curl -s -X PUT "$@"
+}
+
+api_delete() {
+    curl -s -X DELETE "$@"
+}
+
+api_post() {
+    curl -s -X POST "$@"
+}
+
+api_patch() {
+    curl -s -X PATCH "$@"
+}
+
+api_get() {
+    curl -s -X GET "$@"
+}
+
+add_team_to_repo() {
+    local pkgbase="$1"
+    local team="$2"
+    local url
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/teams/$team"
+
+    stat_busy "Adding team ($team) to package repo [$pkgbase]"
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+remove_team_from_repo() {
+    local pkgbase="$1"
+    local team="$2"
+    local url
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/teams/$team"
+
+    stat_busy "Removing team ($team) from package repo [$pkgbase]"
+    api_delete "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+create_repo() {
+    local pkgbase="$1"
+    local url json
+    url="${GIT_HTTPS}/api/v1/org/${GIT_ORG}/repos"
+    json="{ \"auto_init\": true, \"name\": \"$pkgbase\", \"gitignores\": \"ArtixLinuxPackages\", \"readme\": \"Default\" }"
+
+    stat_busy "Create package repo [$pkgbase] in org (${GIT_ORG})"
+    api_post "$url" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "$json"
+    stat_done
+}
+
+transfer_repo() {
+    local pkgbase="$1"
+    local new_owner="$2"
+    local json url
+    json="{ \"new_owner\": \"$new_owner\",  \"team_ids\": [] }"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/transfer"
+
+    stat_busy "Transfer package repo [$pkgbase] in org ($new_owner)"
+    api_post "$url" \
+        -H "accept: application/json" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "$json"
+    stat_done
+}
+
+list_all_repos() {
+    local url
+    url="${GIT_HTTPS}/api/v1/orgs/${GIT_ORG}/repos?limit=10000"
+
+    api_get "$url" \
+        -H "accept: application/json"
+}
+
+list_topics() {
+    local url
+    local pkgbase="$1"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics"
+
+    api_get "$url" \
+        -H "accept: application/json"
+}
+
+add_topic() {
+    local url
+    local pkgbase="$1"
+    local topic="$2"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics/$topic"
+
+    stat_busy "Add topic ($topic) to [$pkgbase]"
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+remove_topic() {
+    local url
+    local pkgbase="$1"
+    local topic="$2"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics/$topic"
+
+    stat_busy "Remove topic ($topic) from [$pkgbase]"
+    api_delete "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+search_topic() {
+    local search="$1"
+    local url
+    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,290 @@
+#!/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'
+
+readonly REPO_CI='.artixlinux/Jenkinsfile'
+
+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
+    local pkgbase
+
+    pkgbase="${pkgbase:-${pkgname}}"
+    version="$(get_full_version)"
+    pkgnames=$(yaml_array "${pkgname[@]}")
+    arches=$(yaml_array "${arch[@]}")
+
+    name="${pkgbase}" 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,102 @@
+#!/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
+
+        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}"
+
+                if [[ -n ${GIT_TOKEN} ]]; then
+                    local topic gitname
+                    gitname=$(get_compliant_name "${pkgbase}")
+
+                    topic="${REPO_MAP[$r]}"
+                    if ! add_topic "${gitname}" "${topic}"; then
+                        warning "failed to add topic: ${topic}"
+                    fi
+
+                    topic="${r}"
+                    if ! remove_topic "${gitname}" "${topic}"; then
+                        warning "failed to remove topic: ${topic}"
+                    fi
+                fi
+
+            done
+            git rm -r x86_64
+        fi
+        cp -r trunk/* ./
+
+        git rm -r trunk
+        if [[ -f .artixlinux/agent.yaml ]]; then
+            git rm .artixlinux/agent.yaml
+        fi
+        if [[ -f .gitignore ]]; then
+            update_gitignore
+        fi
+
+        if [[ -f Jenkinsfile ]]; then
+            git mv Jenkinsfile "${REPO_CI}"
+        fi
+
+        git add .
+        git commit -m "migrate to new layout"
+    fi
+}

src/lib/pkg/deploy.sh

@@ -1,7 +1,11 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ functions
 
+shopt -s extglob
+
 find_cached_pkgfile() {
     local searchdirs=("$PKGDEST" "$PWD") results=()
     local pkg="$1"
@@ -25,13 +29,15 @@ find_cached_pkgfile() {
     esac
 }
 
+shopt -u extglob
+
 get_pkgbasename() {
     local name="$1"
     local rm_pkg=${name%.pkg.tar*}
     rm_pkg=${rm_pkg%-*}
     rm_pkg=${rm_pkg%-*}
     rm_pkg=${rm_pkg%-*}
-    echo "$rm_pkg"
+    printf "%s\n" "$rm_pkg"
 }
 
 #}}}

src/lib/pkg/diff.sh

@@ -0,0 +1,77 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ functions
+
+pkgver_equal() {
+    if [[ $1 = *-* && $2 = *-* ]]; then
+        # if both versions have a pkgrel, then they must be an exact match
+        [[ $1 = "$2" ]]
+    else
+        # otherwise, trim any pkgrel and compare the bare version.
+        [[ ${1%%-*} = "${2%%-*}" ]]
+    fi
+}
+
+shopt -s extglob
+
+find_cached_package() {
+    local searchdirs=("$PWD" "$PKGDEST") results=()
+    local targetname=$1 targetver=$2 targetarch=$3
+    local dir pkg packages pkgbasename name ver rel arch r results
+
+    for dir in "${searchdirs[@]}"; do
+        [[ -d $dir ]] || continue
+
+        shopt -s extglob nullglob
+        mapfile -t packages < <(printf "%s\n" "$dir"/"${targetname}"-"${targetver}"-*"${targetarch}".pkg.tar?(.!(sig|*.*)))
+        shopt -u extglob nullglob
+
+        for pkg in "${packages[@]}"; do
+            [[ -f $pkg ]] || continue
+
+            # avoid adding duplicates of the same inode
+            for r in "${results[@]}"; do
+                [[ $r -ef $pkg ]] && continue 2
+            done
+
+            # split apart package filename into parts
+            pkgbasename=${pkg##*/}
+            pkgbasename=${pkgbasename%.pkg.tar*}
+
+            arch=${pkgbasename##*-}
+            pkgbasename=${pkgbasename%-"$arch"}
+
+            rel=${pkgbasename##*-}
+            pkgbasename=${pkgbasename%-"$rel"}
+
+            ver=${pkgbasename##*-}
+            name=${pkgbasename%-"$ver"}
+
+            if [[ $targetname = "$name" && $targetarch = "$arch" ]] &&
+                pkgver_equal "$targetver" "$ver-$rel"; then
+                results+=("$pkg")
+            fi
+        done
+    done
+
+    case ${#results[*]} in
+        0)
+            return 1
+        ;;
+        1)
+            printf '%s\n' "${results[0]}"
+            return 0
+        ;;
+        *)
+            error 'Multiple packages found:'
+            printf '\t%s\n' "${results[@]}" >&2
+            return 1
+        ;;
+    esac
+}
+
+shopt -u extglob
+
+#}}}

src/lib/pkg/git.sh

@@ -0,0 +1,85 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_GIT_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_GIT_SH=1
+
+set -e
+
+artixpkg_git_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        clone          Clone a package repository
+        config         Configure a clone according to artix specs
+        create         Create a new Gitea package repository
+
+    OPTIONS
+        -h, --help     Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} clone libfoo linux libbar
+        $ ${COMMAND} clone --maintainer maintainer-mynickname
+        $ ${COMMAND} config -t libfoo
+        $ ${COMMAND} config -u libfoo
+        $ ${COMMAND} create libfoo
+_EOF_
+}
+
+artixpkg_git() {
+    if (( $# < 1 )); then
+        artixpkg_git_usage
+        exit 0
+    fi
+
+    # option checking
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_usage
+            exit 0
+        ;;
+        clone)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/git/clone.sh
+            source "${LIBDIR}"/pkg/git/clone.sh
+            artixpkg_git_clone "$@"
+            exit 0
+        ;;
+        config)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/git/config.sh
+            source "${LIBDIR}"/pkg/git/config.sh
+            artixpkg_git_config "$@"
+            exit 0
+        ;;
+        create)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # 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"
+        ;;
+        *)
+            die "invalid command: %s" "$1"
+        ;;
+        esac
+    done
+}

src/lib/pkg/git/clone.sh

@@ -0,0 +1,166 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -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
+
+
+artixpkg_git_clone_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -m, --maintainer=NAME      Clone all packages of the named maintainer
+        --protocol https           Clone the repository over https
+        -t, --topic=NAME           Clone all packages of the named topic
+        -j, --jobs N               Run up to N jobs in parallel (default: $(nproc))
+        --universe                 Clone all existing packages, useful for cache warming
+        -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_clone() {
+    if (( $# < 1 )); then
+        artixpkg_git_clone_usage
+        exit 0
+    fi
+
+    # options
+    local GIT_REPO_BASE_URL="${GIT_SSH}:"
+    local CLONE_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_clone_usage
+                exit 0
+            ;;
+            --protocol=https)
+                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_HTTPS}/"
+                else
+                    die "unsupported protocol: %s" "$2"
+                fi
+                CONFIGURE_OPTIONS+=("$1" "$2")
+                shift 2
+            ;;
+            -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)
+                CLONE_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 (( CLONE_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 clone some packages, please check the output'
+            exit 1
+        fi
+        exit 0
+    fi
+
+    for pkgbase in "${pkgbases[@]}"; do
+        if [[ ! -d ${pkgbase} ]]; then
+            msg "Cloning ${pkgbase} ..."
+            local gitname url
+            gitname=$(get_compliant_name "${pkgbase}")
+            url="${GIT_REPO_BASE_URL}${GIT_ORG}/${gitname}.git"
+            if ! git clone "${url}" "${pkgbase}"; then
+                die 'failed to clone %s' "${pkgbase}"
+            fi
+        else
+            warning "Skip cloning ${pkgbase}: Directory exists"
+        fi
+
+        artixpkg_git_config "${CONFIGURE_OPTIONS[@]}" "${pkgbase}"
+    done
+}

src/lib/pkg/git/config.sh

@@ -0,0 +1,297 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -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(){
+    printf "@Library('artix-ci') import org.artixlinux.RepoPackage\n" > "${REPO_CI}"
+    {
+    printf '\n'
+    printf 'PackagePipeline(new RepoPackage(this))\n'
+    } >> "${REPO_CI}"
+
+    git add "${REPO_CI}"
+    git commit -m "initial ci commit"
+}
+
+artixpkg_git_config_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -m, --maintainer       Set the maintainer topic via gitea api
+        -u, --upstream         Add upstream arch remote
+        --protocol https       Configure remote url to use https
+        -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
+        -h, --help             Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} -t libfoo
+        $ ${COMMAND} -u libfoo
+        $ ${COMMAND} *
+_EOF_
+}
+
+get_packager_name() {
+    local packager=$1
+    local packager_pattern="(.+) <(.+@.+)>"
+    local name
+
+    if [[ ! $packager =~ $packager_pattern ]]; then
+        return 1
+    fi
+
+    name=$(echo "${packager}"|sed -E "s/${packager_pattern}/\1/")
+    printf "%s" "${name}"
+}
+
+get_packager_email() {
+    local packager=$1
+    local packager_pattern="(.+) <(.+@.+)>"
+    local email
+
+    if [[ ! $packager =~ $packager_pattern ]]; then
+        return 1
+    fi
+
+    email=$(echo "${packager}"|sed -E "s/${packager_pattern}/\2/")
+    printf "%s" "${email}"
+}
+
+is_packager_name_valid() {
+    local packager_name=$1
+    if [[ -z ${packager_name} ]]; then
+        return 1
+    elif [[ ${packager_name} == "John Tux" ]]; then
+        return 1
+    elif [[ ${packager_name} == "Unknown Packager" ]]; then
+        return 1
+    fi
+    return 0
+}
+
+is_packager_email_official() {
+    local packager_email=$1
+    if [[ -z ${packager_email} ]]; then
+        return 1
+    elif [[ $packager_email =~ .+@artixlinux.org ]]; then
+        return 0
+    fi
+    return 1
+}
+
+artixpkg_git_config() {
+    # options
+    local GIT_REPO_BASE_URL=${GIT_HTTPS}
+    local official=0
+    local proto=https
+    local proto_force=0
+    local jobs=
+    jobs=$(nproc)
+    local paths=()
+
+    local SET_TOPIC=0
+    local UPSTREAM=0
+
+    # variables
+    local -r command=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    local path realpath pkgbase
+    local PACKAGER GPGKEY packager_name packager_email
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_config_usage
+            exit 0
+        ;;
+        -m|--maintainer)
+            SET_TOPIC=1
+            shift
+        ;;
+        -u|--upstream)
+            UPSTREAM=1
+            shift
+        ;;
+        --protocol=https)
+            proto_force=1
+            shift
+        ;;
+        --protocol)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            if [[ $2 == https ]]; then
+                proto_force=1
+            else
+                die "unsupported protocol: %s" "$2"
+            fi
+            shift 2
+        ;;
+        -j|--jobs)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            jobs=$2
+            shift 2
+        ;;
+        --)
+            shift
+            break
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            paths=("$@")
+            break
+        ;;
+        esac
+    done
+
+    # check if invoked without any path from within a packaging repo
+    if (( ${#paths[@]} == 0 )); then
+        if [[ -f PKGBUILD ]]; then
+            paths=(".")
+        else
+            artixpkg_git_config_usage
+            exit 1
+        fi
+    fi
+
+    # Load makepkg.conf variables to be available for packager identity
+    msg "Collecting packager identity from makepkg.conf"
+    # shellcheck disable=2119
+    load_makepkg_config
+    if [[ -n ${PACKAGER} ]]; then
+        if ! packager_name=$(get_packager_name "${PACKAGER}") || \
+            ! packager_email=$(get_packager_email "${PACKAGER}"); then
+            die "invalid PACKAGER format '${PACKAGER}' in makepkg.conf"
+        fi
+        if ! is_packager_name_valid "${packager_name}"; then
+            die "invalid PACKAGER '${PACKAGER}' in makepkg.conf"
+        fi
+        if is_packager_email_official "${packager_email}"; then
+            official=1
+            if (( ! proto_force )); then
+                proto=ssh
+                GIT_REPO_BASE_URL="${GIT_SSH}/"
+            fi
+        fi
+    fi
+
+    msg2 "name    : ${packager_name:-${YELLOW}undefined${ALL_OFF}}"
+    msg2 "email   : ${packager_email:-${YELLOW}undefined${ALL_OFF}}"
+    msg2 "gpg-key : ${GPGKEY:-${YELLOW}undefined${ALL_OFF}}"
+    if [[ ${proto} == ssh ]]; then
+        msg2 "protocol: ${GREEN}${proto}${ALL_OFF}"
+    else
+        msg2 "protocol: ${YELLOW}${proto}${ALL_OFF}"
+    fi
+
+    # parallelization
+    if [[ ${jobs} != 1 ]] && (( ${#paths[@]} > 1 )); then
+        if [[ -n ${BOLD} ]]; then
+            export ARTOOLS_COLOR=always
+        fi
+        if ! parallel --bar --jobs "${jobs}" "${command}" ::: "${paths[@]}"; then
+            die 'Failed to configure some packages, please check the output'
+            exit 1
+        fi
+        exit 0
+    fi
+
+    for path in "${paths[@]}"; do
+        if ! realpath=$(realpath -e "${path}"); then
+            error "No such directory: ${path}"
+            continue
+        fi
+
+        pkgbase=$(basename "${realpath}")
+        pkgbase=${pkgbase%.git}
+        msg "Configuring ${pkgbase}"
+
+        if [[ ! -d "${path}/.git" ]]; then
+            error "Not a Git repository: ${path}"
+            continue
+        fi
+        ( cd "${path}" || return
+            git config pull.rebase true
+            git config branch.autoSetupRebase always
+
+
+            # setup author identity
+            if [[ -n ${packager_name} ]]; then
+                git config user.name "${packager_name}"
+                git config user.email "${packager_email}"
+            fi
+
+            # force gpg for official packagers
+            if (( official )); then
+                git config commit.gpgsign true
+            fi
+
+            # set custom pgp key from makepkg.conf
+            if [[ -n $GPGKEY ]]; then
+                git config commit.gpgsign true
+                git config user.signingKey "${GPGKEY}"
+            fi
+
+            # topics meta
+            if (( SET_TOPIC )); then
+                if [[ -n ${GIT_TOKEN} ]]; then
+                    local topic gitname
+                    topic="maintainer-${packager_name}"
+                    gitname=$(get_compliant_name "${pkgbase}")
+                    if ! add_topic "${gitname}" "${topic}"; then
+                        warning "failed to set the maintainer topic: ${topic}"
+                    fi
+                fi
+            fi
+            if (( UPSTREAM )); then
+                local remote_url
+                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
+                git mv Jenkinsfile "${REPO_CI}"
+                git commit -m "move jenkinsfile"
+            fi
+
+            if [[ ! -f ${REPO_CI} ]]; 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

@@ -0,0 +1,122 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -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
+
+set -e
+
+
+artixpkg_git_create_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        -c, --clone           Clone the Git repository after creation
+        -t, --team=NAME       Assign team name [default: world]
+        -h, --help            Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo
+_EOF_
+}
+
+artixpkg_git_create() {
+    # options
+    local pkgbases=()
+    local pkgbase
+    local clone=0
+    local config=0
+    local TEAM='world'
+
+    local TEAMS=(system world lib32)
+    # variables
+    local path
+
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_git_create_usage
+            exit 0
+        ;;
+        -c|--clone)
+            clone=1
+            shift
+        ;;
+        -t|--team)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            TEAM="$2"
+            shift 2
+        ;;
+        --team=*)
+            TEAM="${1#*=}"
+            shift
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            pkgbases=("$@")
+            break
+        ;;
+        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
+            if ! path=$(realpath -e .); then
+                die "failed to read path from current directory"
+            fi
+        pkgbases=("$(basename "${path}")")
+        clone=0
+        config=1
+    else
+        artixpkg_git_create_usage
+        exit 1
+        fi
+    fi
+
+    # create
+    for pkgbase in "${pkgbases[@]}"; do
+        local gitname
+        gitname=$(get_compliant_name "${pkgbase}")
+        if [[ -n ${GIT_TOKEN} ]]; then
+            if ! create_repo "${gitname}" >/dev/null; then
+                die "failed to create project: ${pkgbase}"
+            fi
+            if ! add_team_to_repo "${gitname}" "${TEAM}" >/dev/null; then
+                warning "failed to assign team: ${TEAM}"
+            fi
+            msg_success "Successfully created ${pkgbase}"
+        fi
+        if (( clone )); then
+            artixpkg_git_clone "${pkgbase}"
+        elif (( config )); then
+            artixpkg_git_config
+        fi
+
+    done
+
+    # some convenience hints if not in auto clone/config mode
+    if (( ! clone )) && (( ! config )); then
+        cat <<- _EOF_
+
+        For new clones:
+        $(msg2 "artixpkg git clone ${pkgbases[*]}")
+        For existing clones:
+        $(msg2 "artixpkg git config ${pkgbases[*]}")
+_EOF_
+    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

@@ -0,0 +1,99 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -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 built pkgbase to repo
+        move           Move built pkgbase between repos
+        remove         Remove built pkgbase from repo
+        import         Import latest tag from arch upstream
+        show           Show the pkgbase's repo db
+
+    OPTIONS
+        -h, --help     Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} add world libfoo
+        $ ${COMMAND} remove world libfoo
+        $ ${COMMAND} move world-gremlins world libfoo
+        $ ${COMMAND} import libfoo
+        $ ${COMMAND} show libfoo
+_EOF_
+}
+
+artixpkg_repo() {
+    if (( $# < 1 )); then
+        artixpkg_repo_usage
+        exit 0
+    fi
+
+    # option checking
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+                artixpkg_repo_usage
+                exit 0
+        ;;
+        add)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=src/lib/pkg/repo/add.sh
+                source "${LIBDIR}"/pkg/repo/add.sh
+                artixpkg_repo_add "$@"
+                exit 0
+        ;;
+        move)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=src/lib/pkg/repo/move.sh
+                source "${LIBDIR}"/pkg/repo/move.sh
+                artixpkg_repo_move "$@"
+                exit 0
+        ;;
+        remove)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # shellcheck source=src/lib/pkg/repo/remove.sh
+                source "${LIBDIR}"/pkg/repo/remove.sh
+                artixpkg_repo_remove "$@"
+                exit 0
+        ;;
+        import)
+                _ARTOOLS_COMMAND+=" $1"
+                shift
+                # 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"
+        ;;
+        *)
+            die "invalid command: %s" "$1"
+        ;;
+        esac
+    done
+}

src/lib/pkg/repo/add.sh

@@ -0,0 +1,133 @@
+#!/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"
+    shift
+    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

@@ -0,0 +1,137 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_REPO_IMPORT_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_REPO_IMPORT_SH=1
+
+set -e
+
+
+patch_pkgbase(){
+    local name="$1"
+    local pkgbuild
+    pkgbuild=PKGBUILD
+
+    sed -e 's|arch-meson|artix-meson|' -i "${pkgbuild}"
+
+    case "${name}" in
+        glibc)
+            msg "Patching %s" "${name}"
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i "${pkgbuild}"
+        ;;
+        linux|linux-lts|linux-zen|linux-hardened|linux-rt|linux-rt-lts)
+            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 config
+        ;;
+        gstreamer|gst-plugins-*|licenses)
+            msg "Patching %s" "${name}"
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
+                -e 's|(Arch Linux)|(Artix Linux)|' \
+                -i "${pkgbuild}"
+        ;;
+    esac
+}
+
+
+artixpkg_repo_import_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+    OPTIONS
+        --switch TAG       Switch the current workspace to a specified version tag
+        -h, --help         Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} libfoo
+        $ ${COMMAND} libfoo --switch TAG
+_EOF_
+}
+
+artixpkg_repo_import() {
+    if (( $# < 1 )); then
+        artixpkg_repo_import_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+    local TAG
+    local rsync_args=()
+    rsync_args+=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
+    rsync_args+=(--exclude '.git' --exclude '.gitignore' --exclude 'README.md')
+
+    while (( $# )); do
+        case $1 in
+        --switch=*)
+            TAG="${1#*=}"
+            shift
+        ;;
+        -h|--help)
+            artixpkg_repo_import_usage
+            exit 0
+        ;;
+        -*)
+            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
+
+                stat_busy "Checking for upstream url"
+                if ! git config --local --get remote.upstream.url &>/dev/null; then
+                    git remote add upstream "${GIT_UPSTREAM_URL}/${pkgbase}".git
+                fi
+                stat_done
+
+                stat_busy "Fetching upstream tags"
+                git fetch --tags upstream main
+                stat_done
+
+                local latest version
+                latest=$(git describe --tags FETCH_HEAD)
+                version="${latest}"
+                if [[ -n "${TAG}" ]]; then
+                    version="${TAG}"
+                fi
+
+                stat_busy "Importing upstream changeset for ${version}"
+
+                git checkout "${version}" -b "${version}" &>/dev/null
+                local temp
+                temp=$(mktemp -d --tmpdir "${pkgbase}.XXXXXXXXXX")
+
+                rsync "${rsync_args[@]}" "$(pwd)"/ "${temp}"/ &>/dev/null
+                git checkout master &>/dev/null
+                git branch -D "${version}" &>/dev/null
+
+                rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ &>/dev/null
+
+                patch_pkgbase "${pkgbase}"
+
+                stat_done
+            )
+        fi
+
+    done
+}

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,113 @@
+#!/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"
+    shift
+    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,115 @@
+#!/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 "changes: yes"
+        git status -sb
+        return 0
+    fi
+    msg2 "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

@@ -0,0 +1,44 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ pkg conf
+
+load_pkg_config(){
+
+    local conf="$1/artools-pkg.conf"
+
+    [[ -f "$conf" ]] || return 1
+
+    # shellcheck source=config/conf/artools-pkg.conf
+    [[ -r "$conf" ]] && source "$conf"
+
+    local git_domain="gitea.artixlinux.org"
+
+    GIT_HTTPS=${GIT_HTTPS:-"https://${git_domain}"}
+
+    GIT_SSH=${GIT_SSH:-"gitea@${git_domain}"}
+
+    GIT_TOKEN=${GIT_TOKEN:-''}
+
+    GIT_ORG=${GIT_ORG:-'packages'}
+
+    GIT_UPSTREAM_URL=${GIT_UPSTREAM_URL:-"https://gitlab.archlinux.org/archlinux/packaging/packages"}
+
+    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'}
+
+    DBEXT=${DBEXT:-'gz'}
+
+    return 0
+}
+
+#}}}
+
+load_pkg_config "${USER_CONF_DIR}" || load_pkg_config "${SYSCONFDIR}"
+
+prepare_dir "${REPOS_ROOT}"
+prepare_dir "${TREE_DIR_ARTIX}"

src/lib/pkg/version/version.sh

@@ -0,0 +1,43 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_VERSION_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_VERSION_SH=1
+
+set -e
+
+
+artixpkg_version_usage() {
+    COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [OPTIONS]
+
+    Shows the current version information of artixpkg
+
+    OPTIONS
+        -h, --help    Show this help text
+_EOF_
+}
+
+artixpkg_version_print() {
+    cat <<- _EOF_
+    artixpkg @buildtoolver@
+_EOF_
+}
+
+artixpkg_version() {
+    while (( $# )); do
+        case $1 in
+            -h|--help)
+                artixpkg_version_usage
+                exit 0
+            ;;
+            *)
+                die "invalid argument: %s" "$1"
+            ;;
+        esac
+    done
+
+    artixpkg_version_print
+}

src/pkg/artixpkg.in

@@ -0,0 +1,91 @@
+#!/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/message.sh
+source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/pkg/api/gitea.sh
+source "${LIBDIR}"/pkg/api/gitea.sh
+
+set -e
+
+
+usage() {
+    local -r COMMAND=${BASH_SOURCE[0]##*/}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        repo      Pacman database modification for packge update, move etc
+        git       Manage Git packaging repositories and their configuration
+        version   Show artixpkg version information
+
+    OPTIONS
+        -h, --help     Show this help text
+_EOF_
+}
+
+if (( $# < 1 )); then
+    usage
+    exit 1
+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
+
+cd "${TREE_DIR_ARTIX}"
+
+# command checking
+while (( $# )); do
+	case $1 in
+    -h|--help)
+        usage
+        exit 0
+    ;;
+    repo)
+        _ARTOOLS_COMMAND+=" $1"
+        shift
+        # shellcheck source=src/lib/pkg/repo.sh
+        source "${LIBDIR}"/pkg/repo.sh
+        artixpkg_repo "$@"
+        exit 0
+    ;;
+    git)
+        _ARTOOLS_COMMAND+=" $1"
+        shift
+        # shellcheck source=src/lib/pkg/git.sh
+        source "${LIBDIR}"/pkg/git.sh
+        artixpkg_git "$@"
+        exit 0
+    ;;
+    admin)
+        _ARTOOLS_COMMAND+=" $1"
+        shift
+        # shellcheck source=src/lib/pkg/admin.sh
+        source "${LIBDIR}"/pkg/admin.sh
+        artixpkg_admin "$@"
+        exit 0
+    ;;
+    version|--version|-V)
+        _ARTOOLS_COMMAND+=" $1"
+        shift
+        # shellcheck source=src/lib/pkg/version/version.sh
+        source "${LIBDIR}"/pkg/version/version.sh
+        artixpkg_version "$@"
+        exit 0
+    ;;
+    *)
+        die "invalid command: %s" "$1"
+    ;;
+    esac
+done

src/pkg/buildpkg.in

@@ -0,0 +1,134 @@
+#!/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/base/message.sh
+source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
+source "${LIBDIR}"/base/chroot.sh
+
+create_first=false
+rebuild=false
+
+mkchrootpkg_args=(-c -n)
+
+cmd=${0##*/}
+repo=${cmd#*-}
+base_devel=('base-devel')
+chroots_pkg="${CHROOTS_DIR}/buildpkg"
+arch=$(uname -m)
+
+usage() {
+    printf 'Usage: %s [options] -- [mkchrootpkg_args]\n' "${0##*/}"
+    printf '    -r <dir>           Create chroots in this directory\n'
+    printf '    -d <dir>           Destination repo chroot\n'
+    printf '    -c                 Recreate the chroot before building\n'
+    printf '    -m                 Major rebuild\n'
+    printf '    -N                 Disable check() function\n'
+    printf '    -C                 Run checkpkg after built\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf 'Default mkchrootpkg_args args: %s\n' "${mkchrootpkg_args[*]}"
+    printf '\n'
+    exit "$1"
+}
+
+opts='hcCNmr:d:'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) chroots_pkg="$OPTARG" ;;
+        d) repo="$OPTARG" ;;
+        c) create_first=true ;;
+        m) rebuild=true ;;
+        C) mkchrootpkg_args+=(-C) ;;
+        N) mkchrootpkg_args+=(-N) ;;
+        h|?) usage 0 ;;
+    esac
+done
+
+if ${rebuild};then
+    repo='default'
+else
+    case ${repo} in
+        system|world|galaxy) repo='default' ;;
+        lib32*) base_devel+=('multilib-devel') ;;
+        *-gremlins|*-goblins) repo=${repo#*-} ;;
+    esac
+fi
+
+pacman_conf="${DATADIR}/pacman.conf.d/${repo}.conf"
+[[ -f "${USER_CONF_DIR}/pacman.conf.d/${repo}.conf" ]] && pacman_conf="${USER_CONF_DIR}/pacman.conf.d/${repo}.conf"
+
+makepkg_conf="${DATADIR}/makepkg.conf.d/${arch}.conf"
+[[ -f ${USER_CONF_DIR}/makepkg.conf.d/${arch}.conf ]] && makepkg_conf="${USER_CONF_DIR}/makepkg.conf.d/${arch}.conf"
+
+if [[ -f "${DATADIR}/setarch-aliases.d/${arch}" ]]; then
+    read -r set_arch < "${DATADIR}/setarch-aliases.d/${arch}"
+else
+    set_arch="${arch}"
+fi
+
+# Architecture-specific Mount
+# arch_mounts=()
+# if [[ -f "${DATADIR}/mount.d/${arch}" ]]; then
+#     mapfile -t arch_mounts < "${DATADIR}/mount.d/${arch}"
+# fi
+# for arch_mount in "${arch_mounts[@]}"; do
+#     if [[ $arch_mount = rw* ]]; then
+#         arch_mount=${arch_mount#rw }
+#         in_array "$arch_mount" "${mkchrootpkg_args[@]}" || mkchrootpkg_args+=("-d" "$arch_mount")
+#     elif [[ $arch_mount = ro* ]]; then
+#         arch_mount=${arch_mount#ro }
+#         in_array "$arch_mount" "${mkchrootpkg_args[@]}" || mkchrootpkg_args+=("-D" "$arch_mount")
+#     fi
+# done
+
+check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME "${BASH_SOURCE[0]}" "$@"
+
+mkchrootpkg_args+=("${@:$OPTIND}")
+
+if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
+    msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"
+
+    for copy in "${chroots_pkg}/${repo}-${arch}"/*; do
+        [[ -d $copy ]] || continue
+        msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
+
+        lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
+
+        subvolume_delete_recursive "${copy}"
+        rm -rf --one-file-system "${copy}"
+    done
+    lock_close 9
+
+    rm -rf --one-file-system "${chroots_pkg}/${repo}-${arch}"
+    (umask 0022; mkdir -p "${chroots_pkg}/${repo}-${arch}")
+    setarch "${set_arch}" mkchroot \
+        -C "${pacman_conf}" \
+        -M "${makepkg_conf}" \
+        "${chroots_pkg}/${repo}-${arch}/root" \
+        "${base_devel[@]}" || abort
+else
+    lock 9 "${chroots_pkg}/${repo}-${arch}/root.lock" "Locking clean chroot"
+    chroot-run \
+        -C "${pacman_conf}" \
+        -M "${makepkg_conf}" \
+        "${chroots_pkg}/${repo}-${arch}/root" \
+        pacman -Syuu --noconfirm || abort
+fi
+
+# Always build official packages reproducibly
+if [[ ! -v SOURCE_DATE_EPOCH ]]; then
+    SOURCE_DATE_EPOCH=$(date +%s)
+    export SOURCE_DATE_EPOCH
+fi
+
+msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
+exec mkchrootpkg -r "${chroots_pkg}/${repo}-${arch}" "${mkchrootpkg_args[@]}"

src/pkg/checkpkg.in

@@ -1,89 +1,16 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
 
-shopt -s extglob
+# 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
 
-#{{{ functions
-
-pkgver_equal() {
-    if [[ $1 = *-* && $2 = *-* ]]; then
-        # if both versions have a pkgrel, then they must be an exact match
-        [[ $1 = "$2" ]]
-    else
-        # otherwise, trim any pkgrel and compare the bare version.
-        [[ ${1%%-*} = "${2%%-*}" ]]
-    fi
-}
-
-find_cached_package() {
-    local searchdirs=("$PKGDEST" "$PWD") results=()
-    local targetname=$1 targetver=$2 targetarch=$3
-    local dir pkg pkgbasename name ver rel arch r results
-
-    for dir in "${searchdirs[@]}"; do
-        [[ -d $dir ]] || continue
-
-        for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
-            [[ -f $pkg ]] || continue
-
-            # avoid adding duplicates of the same inode
-            for r in "${results[@]}"; do
-                [[ $r -ef $pkg ]] && continue 2
-            done
-
-            # split apart package filename into parts
-            pkgbasename=${pkg##*/}
-            pkgbasename=${pkgbasename%.pkg.tar*}
-
-            arch=${pkgbasename##*-}
-            pkgbasename=${pkgbasename%-"$arch"}
-
-            rel=${pkgbasename##*-}
-            pkgbasename=${pkgbasename%-"$rel"}
-
-            ver=${pkgbasename##*-}
-            name=${pkgbasename%-"$ver"}
-
-            if [[ $targetname = "$name" && $targetarch = "$arch" ]] &&
-                pkgver_equal "$targetver" "$ver-$rel"; then
-                results+=("$pkg")
-            fi
-        done
-    done
-
-    case ${#results[*]} in
-        0)
-            return 1
-        ;;
-        1)
-            printf '%s\n' "${results[0]}"
-            return 0
-        ;;
-        *)
-            error 'Multiple packages found:'
-            printf '\t%s\n' "${results[@]}" >&2
-            return 1
-        ;;
-    esac
-}
-
-#}}}
-
 usage() {
     cat <<- _EOF_
         Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]
@@ -135,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'
@@ -197,7 +124,7 @@ for _pkgname in "${pkgname[@]}"; do
     if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
         message="Sonames differ in $_pkgname!"
         (( WARN )) && warning "$message" || msg "$message"
-        echo "$diff_output"
+        printf "%s\n" "$diff_output"
     else
         msg "No soname differences for %s." "$_pkgname"
     fi

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

@@ -0,0 +1,95 @@
+#!/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/deploy.sh
+source "${LIBDIR}"/pkg/deploy.sh
+
+#{{{ deploy
+
+add() {
+    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
+        msg "Found: %s" "${pkgfile}"
+        packages+=("${pkgname}")
+        action='add'
+        ln -sfv "${pkgfile}"{,.sig} "${repo_path}"/
+    fi
+}
+
+remove(){
+    packages+=("${pkgname}")
+    action='remove'
+    # pkg removal will be done by a patched repo-remove honoring -R
+}
+
+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
+        if [[ -n "${action}" ]]; then
+            repo-"${action}" -R "${dest_repo}.${db_ext}" "${packages[@]}"
+        fi
+    )
+}
+
+#}}}
+
+load_makepkg_config
+
+db_ext="db.tar.${DBEXT}"
+
+add_pkg=false
+rm_pkg=false
+
+cmd=${0##*/}
+dest_repo=${cmd#*-}
+
+usage() {
+    printf "Usage: %s [options]\n" "${cmd}"
+    printf '    -d <dest>          Destination repository\n'
+    printf '    -a                 Add package(s) to repository\n'
+    printf '    -r                 Remove package(s) from repository\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+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 ;;
+        h|?) usage 0 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+passfiles=("$@")
+
+if [[ -n "${passfiles[*]}" ]]; then
+    if ${add_pkg}; then
+        repo_action add
+    fi
+    if ${rm_pkg}; then
+        repo_action remove
+    fi
+fi

src/pkg/diffpkg.in

@@ -0,0 +1,334 @@
+#!/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/pkg/diff.sh
+source "${LIBDIR}"/pkg/diff.sh
+
+usage() {
+    cat <<- _EOF_
+    Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] [MODES] [FILE|PKGNAME...]
+
+    Searches for a locally built package corresponding to the PKGBUILD, and
+    downloads the last version of that package from the Pacman repositories.
+    It then compares the package archives using different modes while using
+    simple tar content list by default.
+
+    When given one package, use it to diff against the locally built one.
+    When given two packages, diff both packages against each other.
+
+    In either case, a package name will be converted to a filename from the
+    cache, and diffpkg will proceed as though this filename was initially
+    specified.
+
+    OPTIONS
+        -M, --makepkg-config Set an alternate makepkg configuration file
+        -v, --verbose        Provide more detailed/unfiltered output
+        -h, --help           Show this help text
+
+    MODES
+        -l, --list           Activate content list diff mode (default)
+        -d, --diffoscope     Activate diffoscope diff mode
+        -p, --pkginfo        Activate .PKGINFO diff mode
+        -b, --buildinfo      Activate .BUILDINFO diff mode
+_EOF_
+}
+
+MAKEPKG_CONF=/etc/makepkg.conf
+POOLDIR=/srv/pkgpool
+
+VERBOSE=0
+TARLIST=0
+DIFFOSCOPE=0
+PKGINFO=0
+BUILDINFO=0
+
+DIFFMODE=--side-by-side
+DIFFCOLOR=--color=auto
+DIFFWIDTH=--width=auto
+DIFFOPTIONS=(--expand-tabs)
+
+# option checking
+while (( $# )); do
+    case $1 in
+        -h|--help)
+            usage
+            exit 0
+        ;;
+        -M|--makepkg-config)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            MAKEPKG_CONF="$2"
+            shift 2
+        ;;
+        -l|--list)
+            TARLIST=1
+            shift
+        ;;
+        -d|--diffoscope)
+            DIFFOSCOPE=1
+            shift
+        ;;
+        -p|--pkginfo)
+            PKGINFO=1
+            shift
+        ;;
+        -b|--buildinfo)
+            BUILDINFO=1
+            shift
+        ;;
+        -v|--verbose)
+            VERBOSE=1
+            shift
+        ;;
+        -u|-U|--unified)
+            DIFFMODE=--unified
+            shift
+        ;;
+        -y|--side-by-side)
+            DIFFMODE=--side-by-side
+            shift
+        ;;
+        --color|--color=*)
+            if [[ $2 == never || $2 == always || $2 == auto ]]; then
+                DIFFCOLOR="--color=$2"
+                shift 2
+                continue
+            fi
+            if [[ $1 == --color ]]; then
+                DIFFCOLOR="--color=auto"
+            else
+                DIFFCOLOR="$1"
+            fi
+            shift
+        ;;
+        -W|--width)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            DIFFWIDTH="--width=$2"
+            shift 2
+        ;;
+        --width=*)
+            DIFFWIDTH="$1"
+            shift
+        ;;
+        -P|--pool)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            POOLDIR="$2"
+            shift 2
+        ;;
+        --pool=*)
+            POOLDIR="${1#*=}"
+            shift
+        ;;
+        --)
+            shift
+            break
+        ;;
+        -*|--*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            break
+        ;;
+    esac
+done
+
+# Set options based on flags or magic values
+if (( VERBOSE )); then
+    if [[ $DIFFMODE == --unified ]]; then
+        DIFFMODE="--unified=99999"
+    fi
+else
+    DIFFOPTIONS+=(--suppress-common-lines)
+fi
+if [[ $DIFFWIDTH == --width=columns ]]; then
+    DIFFWIDTH="--width=${COLUMNS:-130}"
+fi
+if [[ $DIFFWIDTH != --width=auto ]]; then
+    DIFFOPTIONS+=("${DIFFWIDTH}")
+fi
+DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
+
+if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
+    TARLIST=1
+fi
+
+# Source makepkg.conf; fail if it is not found
+if [[ -r "${MAKEPKG_CONF}" ]]; then
+    # shellcheck source=config/makepkg/x86_64.conf
+    source "${MAKEPKG_CONF}"
+else
+    die "${MAKEPKG_CONF} not found!"
+fi
+
+# Source user-specific makepkg.conf overrides
+if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
+    # shellcheck source=/dev/null
+    source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
+elif [[ -r "$HOME/.makepkg.conf" ]]; then
+    # shellcheck source=/dev/null
+    source "$HOME/.makepkg.conf"
+fi
+
+STARTDIR=$(pwd)
+trap 'rm -rf $TMPDIR' EXIT INT TERM QUIT
+TMPDIR=$(mktemp -d --tmpdir diffpkg-script.XXXXXXXX)
+export TMPDIR
+
+tar_list() {
+    bsdtar tf "$*" | if (( VERBOSE )); then
+        cat
+    else
+        sed -E 's|^usr/lib/modules/[0-9][^/]+|usr/lib/modules/[…]|g'
+    fi | sort
+}
+
+file_line_length() {
+    path="$1"
+    wc -L "${path}" | tail -n1 | sed -E 's/^ +//g' | cut -d' ' -f1
+}
+
+file_diff_columns() {
+    file1="$1"
+    file2="$2"
+    file1_length=$(file_line_length "$file1")
+    file2_length=$(file_line_length "$file2")
+    echo $(( file1_length + file2_length + 3 ))
+}
+
+diff_pkgs() {
+    local oldpkg newpkg
+    oldpkg=$(readlink -m "$1")
+    newpkg=$(readlink -m "$2")
+
+    [[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
+    [[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
+
+    local -a diffoptions
+    diffoptions=("${DIFFOPTIONS[@]}" --label "${oldpkg}" --label "${newpkg}")
+
+    if (( TARLIST )); then
+        tar_list "$oldpkg" > "$TMPDIR/old"
+        tar_list "$newpkg" > "$TMPDIR/new"
+    fi
+
+    if (( PKGINFO )); then
+        bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
+        bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
+    fi
+
+    if (( BUILDINFO )); then
+        bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
+        bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
+    fi
+
+    if (( TARLIST || PKGINFO || BUILDINFO )); then
+    # Resolve dynamic auto width one we know the content to diff
+        if [[ $DIFFWIDTH == --width=auto ]]; then
+            AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
+            diffoptions+=("--width=${AUTOLENGTH}")
+        fi
+
+        # Print a header for side-by-side view as it lacks labels
+        if [[ $DIFFMODE == --side-by-side ]]; then
+            printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
+        fi
+
+        diff "${diffoptions[@]}" "$TMPDIR/old" "$TMPDIR/new"
+    fi
+
+    if (( DIFFOSCOPE )); then
+        diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
+    fi
+}
+
+shopt -s extglob
+
+fetch_pkg() {
+    local pkg pkgdest pkgurl
+    case $1 in
+        *://*)
+            pkgurl=$1 ;;
+        /*|*/*)
+            pkgurl=$(readlink -m "$1") ;;
+        *.pkg.tar*)
+            pkgurl=$1 ;;
+        '')
+        ;;
+        *)
+            pkg=$1 ;;
+    esac
+
+    if [[ -z ${pkgurl} ]]; then
+        # Try to find latest package in pool dir
+        if [[ -d ${POOLDIR} ]]; then
+            shopt -s extglob nullglob
+            pkgurl=$(printf "%s\n" "${POOLDIR}"/*/"${_pkgname}"-!(*-*)-!(*-*)-!(*-*).pkg.tar!(*.sig)|sort -Vr|head -1)
+            shopt -u extglob nullglob
+        fi
+        # Search via pacman database if no pool file exists
+        if [[ ! -f ${pkgurl} ]]; then
+            pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+            die "Couldn't download previous package for %s." "$pkg"
+        fi
+    fi
+
+    pkg=${pkgurl##*/}
+    pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
+
+    if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
+        ln -sf "${pkgurl#file://}" "$pkgdest"
+    elif [[ -f "$PKGDEST/$pkg" ]]; then
+        ln -sf "$PKGDEST/$pkg" "$pkgdest"
+    elif [[ -f "$STARTDIR/$pkg" ]]; then
+        ln -sf "$STARTDIR/$pkg" "$pkgdest"
+    elif [[ $pkgurl = *://* ]]; then
+        curl -fsLC - --retry 3 --retry-delay 3 -o "$pkgdest" "$pkgurl" || \
+        die "Couldn't download %s" "$pkgurl"
+    else
+        die "File not found: %s" "$pkgurl"
+    fi
+
+    echo "$pkgdest"
+}
+
+shopt -u extglob
+
+if (( $# < 2 )); then
+    if [[ ! -f PKGBUILD ]]; then
+        die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
+    fi
+
+    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+    . ./PKGBUILD
+    if [[ ${arch[0]} == 'any' ]]; then
+        CARCH='any'
+    fi
+
+    for _pkgname in "${pkgname[@]}"; do
+        comparepkg=$_pkgname
+        pkgurl=
+        target_pkgver=$(get_full_version "$_pkgname")
+        if ! pkgfile=$(find_cached_package "$_pkgname" "$target_pkgver" "$CARCH"); then
+            die 'tarball not found for package: %s' "${_pkgname}-$target_pkgver"
+        fi
+
+        ln -s "$pkgfile" "$TMPDIR"
+
+        if (( $# )); then
+            comparepkg="$1"
+        fi
+
+        oldpkg=$(fetch_pkg "$comparepkg") || exit 1
+
+        diff_pkgs "$oldpkg" "$pkgfile"
+    done
+else
+    file1=$(fetch_pkg "$1") || exit 1
+    file2=$(fetch_pkg "$2") || exit 1
+
+    diff_pkgs "$file1" "$file2"
+fi

src/pkg/export-pkgbuild-keys.in

@@ -0,0 +1,73 @@
+#!/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
+
+usage() {
+    cat <<- _EOF_
+        Usage: ${BASH_SOURCE[0]##*/}
+
+        Export the PGP keys from a PKGBUILDs validpgpkeys array into the keys/pgp/
+        subdirectory. Useful for distributing packager validated source signing
+        keys alongside PKGBUILDs.
+
+        OPTIONS
+            -h, --help      Show this help text
+_EOF_
+}
+
+# option checking
+while (( $# )); do
+    case $1 in
+        -h|--help) usage; exit 0 ;;
+        *) die "invalid argument: %s" "$1" ;;
+    esac
+done
+
+if [[ ! -f PKGBUILD ]]; then
+    die "This must be run a directory containing a PKGBUILD."
+fi
+
+mapfile -t validpgpkeys < <(
+    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+    . ./PKGBUILD
+    if (( ${#validpgpkeys[@]} )); then
+        printf "%s\n" "${validpgpkeys[@]}"
+    fi
+)
+
+msg "Exporting ${#validpgpkeys[@]} PGP keys..."
+if (( ${#validpgpkeys[@]} == 0 )); then
+    exit 0
+fi
+
+trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
+
+mkdir -p keys/pgp
+error=0
+
+for key in "${validpgpkeys[@]}"; do
+    gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-minimal "$key" 2>/dev/null
+
+    # gpg does not give a non-zero return value if it fails to export...
+    if [[ -f $TEMPDIR/$key.asc ]]; then
+        msg2 "Exported $key"
+        mv "$TEMPDIR/$key.asc" "keys/pgp/$key.asc"
+    else
+        if [[ -f keys/pgp/$key.asc ]]; then
+            warning "Failed to update key: $key"
+        else
+            error "Key unavailable: $key"
+            error=1
+        fi
+    fi
+done
+
+if (( error )); then
+    die "Failed to export all \'validpgpkeys\' entries."
+fi

src/pkg/find-libdeps.in

@@ -1,21 +1,13 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
 
 set -e
-shopt -s extglob
 
 IGNORE_INTERNAL=0
 
@@ -32,9 +24,9 @@ case $script_mode in
 esac
 
 if [[ -z $1 ]]; then
-    echo "${0##*/} [options] <package file|extracted package dir>"
-    echo "Options:"
-    echo "    --ignore-internal      ignore internal libraries"
+    printf "%s [options] <package file|extracted package dir>\n" "${0##*/}"
+    printf "Options:\n"
+    printf "    --ignore-internal      ignore internal libraries\n"
     exit 1
 fi
 
@@ -51,9 +43,13 @@ else
     pushd "$WORKDIR" >/dev/null
 fi
 
+shopt -s extglob
+
 process_sofile() {
     # extract the library name: libfoo.so
+    shopt -s extglob nullglob
     soname="${sofile%.so?(+(.+([0-9])))}".so
+    shopt -u extglob nullglob
     # extract the major version: 1
     soversion="${sofile##*\.so\.}"
     if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then
@@ -61,11 +57,13 @@ process_sofile() {
     fi
     if ! in_array "${soname}=${soversion}-${soarch}" "${soobjects[@]}"; then
         # libfoo.so=1-64
-        echo "${soname}=${soversion}-${soarch}"
+        printf "%s\n" "${soname}=${soversion}-${soarch}"
         soobjects+=("${soname}=${soversion}-${soarch}")
     fi
 }
 
+shopt -u extglob
+
 case $script_mode in
     deps) find_args=(-perm -u+x);;
     provides) find_args=(-name '*.so*');;

src/pkg/finddeps.in

@@ -1,34 +1,27 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
 
 match=$1
 
 if [[ -z $match ]]; then
-    echo 'Usage: finddeps <depname>'
-    echo ''
-    echo 'Find packages that depend on a given depname.'
-    echo 'Run this script from the top-level directory of your ABS tree.'
-    echo ''
+    printf 'Usage: finddeps <depname>\n'
+    printf '\n'
+    printf 'Find packages that depend on a given depname.\n'
+    printf 'Run this script from the top-level directory of your ABS tree.\n'
+    printf '\n'
     exit 1
 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,18 +1,11 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
 
 ifs=$IFS
 IFS="${IFS}:"
@@ -40,7 +33,7 @@ for tree in $PATH $libdirs $extras; do
             #  Is an ELF binary.
             if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
                 #  Missing lib.
-                echo "$i:" >> "$TEMPDIR/raw.txt"
+                printf "%s\n" "$i:" >> "$TEMPDIR/raw.txt"
                 ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
             fi
         fi

src/pkg/makerepropkg.in

@@ -0,0 +1,281 @@
+#!/bin/bash
+#
+# makerepropkg - rebuild a package to see if it is reproducible
+#
+# Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
+#
+# 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/base/message.sh
+source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
+source "${LIBDIR}"/base/chroot.sh
+
+declare -A buildinfo
+declare -a buildenv buildopts installed installpkgs
+
+archiveurl='https://archive.artixlinux.org/packages'
+buildroot="${CHROOTS_DIR}"/reproducible
+diffoscope=0
+
+chroot=$USER
+[[ -n ${SUDO_USER:-} ]] && chroot=$SUDO_USER
+[[ -z "$chroot" || $chroot = root ]] && chroot=copy
+
+parse_buildinfo() {
+    local line var val
+
+    while read -r line; do
+        var="${line%% = *}"
+        val="${line#* = }"
+        case ${var} in
+            buildenv)
+                buildenv+=("${val}")
+                ;;
+            options)
+                buildopts+=("${val}")
+                ;;
+            installed)
+                installed+=("${val}")
+                ;;
+            *)
+                buildinfo["${var}"]="${val}"
+                ;;
+        esac
+    done
+}
+
+get_pkgfile() {
+    local cdir=${cache_dirs[0]}
+    local pkgfilebase=${1}
+    local mode=${2}
+    local pkgname=${pkgfilebase%-*-*-*}
+    local pkgfile ext
+
+    # try without downloading
+    if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then
+        return 0
+    fi
+
+    for ext in .zst .xz ''; do
+        pkgfile=${pkgfilebase}.pkg.tar${ext}
+
+        for c in "${cache_dirs[@]}"; do
+            if [[ -f ${c}/${pkgfile} ]]; then
+                cdir=${c}
+                break
+            fi
+        done
+
+        for f in "${pkgfile}" "${pkgfile}.sig"; do
+            if [[ ! -f "${cdir}/${f}" ]]; then
+                if [[ ${mode} = localonly ]]; then
+                    continue 2
+                fi
+                msg2 "retrieving '%s'..." "${f}" >&2
+                curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2
+            fi
+        done
+        printf '%s\n' "file://${cdir}/${pkgfile}"
+        return 0
+    done
+
+    return 1
+}
+
+get_makepkg_conf() {
+    local fname=${1}
+    local arch="${2}"
+    local makepkg_conf="${3}"
+    if ! buildtool_file=$(get_pkgfile "${fname}"); then
+        error "failed to retrieve ${fname}"
+        return 1
+    fi
+    msg2 "using makepkg.conf from ${fname}"
+    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/artools/makepkg.conf.d/"${arch}".conf > "${makepkg_conf}"
+    return 0
+}
+
+usage() {
+    cat << __EOF__
+    usage: ${BASH_SOURCE[0]##*/} [options] <package_file>
+
+    Run this script in a PKGBUILD dir to build a package inside a
+    clean chroot while attempting to reproduce it. The package file
+    will be used to derive metadata needed for reproducing the
+    package, including the .PKGINFO as well as the buildinfo.
+
+    For more details see https://reproducible-builds.org/
+
+    OPTIONS
+        -d            Run diffoscope if the package is unreproducible
+        -c <dir>      Set pacman cache
+        -M <file>     Location of a makepkg config file
+        -l <chroot>   The directory name to use as the chroot namespace
+                    Useful for maintaining multiple copies
+                    Default: $chroot
+        -h            Show this usage message
+__EOF__
+}
+
+orig_args=("$@")
+
+while getopts 'dM:c:l:h' arg; do
+    case "$arg" in
+        d) diffoscope=1 ;;
+        M) artixroot_args+=(-M "$OPTARG") ;;
+        c) cache_dirs+=("$OPTARG") ;;
+        l) chroot="$OPTARG" ;;
+        h) usage; exit 0 ;;
+        *|?) usage; exit 1 ;;
+    esac
+done
+shift $((OPTIND - 1))
+
+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'."
+        plain "Try '${BASH_SOURCE[0]##*/} -h' for more information." >&2
+        exit 1
+    }
+    msg "Reproducing all pkgnames listed in ./PKGBUILD"
+    set -- "${pkgnames[@]}"
+fi
+
+# check each package to see if it's a file, and if not, try to download it
+# using pacman -Sw, and get the filename from there
+splitpkgs=()
+for p in "$@"; do
+    if [[ -f ${p} ]]; then
+        splitpkgs+=("${p}")
+    else
+        pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null) || { error "package name '%s' not in repos" "${p}"; exit 1; }
+        pkgfile=${pkgfile_remote#file://}
+        if [[ ! -f ${pkgfile} ]]; then
+            msg "Downloading package '%s' into pacman's cache" "${pkgfile}"
+            sudo pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1
+            pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null)
+            pkgfile="${pkgfile_remote#file://}"
+        fi
+        splitpkgs+=("${pkgfile}")
+    fi
+done
+
+for f in "${splitpkgs[@]}"; do
+    if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then
+        error "file is not a valid pacman package: '%s'" "${f}"
+        exit 1
+    fi
+done
+
+if (( ${#cache_dirs[@]} == 0 )); then
+    mapfile -t cache_dirs < <(pacman-conf CacheDir)
+fi
+
+ORIG_HOME=${HOME}
+IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
+load_makepkg_config
+HOME=${ORIG_HOME}
+[[ -d ${SRCDEST} ]] || SRCDEST=${PWD}
+
+parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO)
+export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
+PACKAGER="${buildinfo[packager]}"
+BUILDDIR="${buildinfo[builddir]}"
+BUILDTOOL="${buildinfo[buildtool]}"
+BUILDTOOLVER="${buildinfo[buildtoolver]}"
+PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}}
+
+# nuke and restore reproducible testenv
+namespace="$buildroot/$chroot"
+lock 9 "${namespace}.lock" "Locking chroot namespace '%s'" "${namespace}"
+for copy in "${namespace}"/*/; do
+    [[ -d ${copy} ]] || continue
+    subvolume_delete_recursive "${copy}"
+done
+rm -rf --one-file-system "${namespace}"
+(umask 0022; mkdir -p "${namespace}")
+
+for fname in "${installed[@]}"; do
+    if ! allpkgfiles+=("$(get_pkgfile "${fname}")"); then
+        error "failed to retrieve ${fname}"
+        exit 1
+    fi
+done
+
+trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
+
+makepkg_conf="${TEMPDIR}/makepkg.conf"
+# anything before buildtool support is pinned to the last none buildtool aware release
+if [[ -z "${BUILDTOOL}" ]]; then
+    get_makepkg_conf "artools-pkg-0.28.2-1-any" "${CARCH}" "${makepkg_conf}" || exit 1
+# prefere to assume artools-pkg up until matching makepkg version so repository packages remain reproducible
+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 ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
+    true
+# fallback to current makepkg.conf
+else
+    warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback"
+    makepkg_conf="${DATADIR}"/makepkg.conf
+fi
+printf '%s\n' "${allpkgfiles[@]}" | mkchroot -M "${makepkg_conf}" -U "${artixroot_args[@]}" "${namespace}/root" - || exit 1
+
+# use makechrootpkg to prep the build directory
+mkchrootpkg -r "${namespace}" -l build -- --packagelist || exit 1
+
+# set detected makepkg.conf options
+{
+    for var in PACKAGER BUILDDIR BUILDTOOL BUILDTOOLVER PKGEXT; do
+        printf '%s=%s\n' "${var}" "${!var@Q}"
+    done
+    printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
+    printf 'BUILDENV=(%s)\n' "${buildenv[*]@Q}"
+} >> "${namespace}/build"/etc/makepkg.conf
+install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${namespace}/build/${BUILDDIR}"
+
+bindmounts+=("-B:${PWD}:/startdir" "-B:${SRCDEST}:/srcdest")
+
+# kick off the build
+chroot-run \
+    -b "${bindmounts[*]}" \
+    "${namespace}/build" \
+    /chrootbuild -C --noconfirm --log --holdver --skipinteg
+ret=$?
+
+if (( ret == 0 )); then
+    msg2 "built succeeded! built packages can be found in ${namespace}/build/pkgdest"
+    msg "comparing artifacts..."
+
+    for pkgfile in "${splitpkgs[@]}"; do
+        comparefiles=("${pkgfile}" "${namespace}/build/pkgdest/${pkgfile##*/}")
+        if cmp -s "${comparefiles[@]}"; then
+            msg2 "Package '%s' successfully reproduced!" "${pkgfile}"
+        else
+            ret=1
+            warning "Package '%s' is not reproducible. :(" "${pkgfile}"
+            sha256sum "${comparefiles[@]}"
+            if (( diffoscope )); then
+                diffoscope "${comparefiles[@]}"
+            fi
+        fi
+    done
+fi
+
+# return failure from chrootbuild, or the reproducibility status
+exit ${ret}

src/pkg/mkchrootpkg.in

@@ -1,22 +1,16 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
 
-export BUILDTOOL=artools-pkg
-export BUILDTOOLVER=m4_artools_pkg_version
+# 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=@buildtool@
+export BUILDTOOLVER=@buildtoolver@
 
 shopt -s nullglob
 
@@ -36,7 +30,7 @@ run_namcap=0
 run_checkpkg=0
 temp_chroot=0
 
-bindmounts=()
+bindmounts=''
 
 copy=$USER
 [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
@@ -44,43 +38,43 @@ copy=$USER
 src_owner=${SUDO_USER:-$USER}
 
 usage() {
-    echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
-    echo ' Run this script in a PKGBUILD dir to build a package inside a'
-    echo ' clean chroot. Arguments passed to this script after the'
-    echo ' end-of-options marker (--) will be passed to makepkg.'
-    echo ''
-    echo ' The chroot dir consists of the following directories:'
-    echo ' <chrootdir>/{root, copy} but only "root" is required'
-    echo ' by default. The working copy will be created as needed'
-    echo ''
-    echo 'The chroot "root" directory must be created via the following'
-    echo 'command:'
-    echo '    mkchroot <chrootdir>/root base-devel'
-    echo ''
-    echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER'
-    echo 'from makepkg.conf(5), if those variables are not part of the'
-    echo 'environment.'
-    echo ''
-    echo "Default makepkg args: ${default_makepkg_args[*]}"
-    echo ''
-    echo 'Flags:'
-    echo '-h         This help'
-    echo '-c         Clean the chroot before building'
-    echo '-d <dir>   Bind directory into build chroot as read-write'
-    echo '-D <dir>   Bind directory into build chroot as read-only'
-    echo '-u         Update the working copy of the chroot before building'
-    echo '           This is useful for rebuilds without dirtying the pristine'
-    echo '           chroot'
-    echo '-r <dir>   The chroot dir to use'
-    echo '-I <pkg>   Install a package into the working copy of the chroot'
-    echo '-l <copy>  The directory to use as the working copy of the chroot'
-    echo '           Useful for maintaining multiple copies'
-    echo "           Default: $copy"
-    echo '-n         Run namcap on the package'
-    echo '-C         Run checkpkg on the package'
-    echo '-N         Disable check() function'
-    echo '-T         Build in a temporary directory'
-    echo '-U         Run makepkg as a specified user'
+    printf 'Usage: %s [options] -r <chrootdir> [--] [makepkg args]\n' "${0##*/}"
+    printf ' Run this script in a PKGBUILD dir to build a package inside a\n'
+    printf ' clean chroot. Arguments passed to this script after the\n'
+    printf ' end-of-options marker (--) will be passed to makepkg.\n'
+    printf '\n'
+    printf ' The chroot dir consists of the following directories:\n'
+    printf ' <chrootdir>/{root, copy} but only "root" is required\n'
+    printf ' by default. The working copy will be created as needed\n'
+    printf '\n'
+    printf "The chroot 'root' directory must be created via the following\n"
+    printf 'command:\n'
+    printf '    mkchroot <chrootdir>/root base-devel\n'
+    printf '\n'
+    printf 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER\n'
+    printf 'from makepkg.conf(5), if those variables are not part of the\n'
+    printf 'environment.\n'
+    printf '\n'
+    printf 'Default makepkg args: %s\n' "${default_makepkg_args[*]}"
+    printf '\n'
+    printf 'Flags:\n'
+    printf ' -h         This help\n'
+    printf ' -c         Clean the chroot before building\n'
+    printf ' -d <dir>   Bind directory into build chroot as read-write\n'
+    printf ' -D <dir>   Bind directory into build chroot as read-only\n'
+    printf ' -u         Update the working copy of the chroot before building\n'
+    printf '           This is useful for rebuilds without dirtying the pristine\n'
+    printf '           chroot\n'
+    printf ' -r <dir>   The chroot dir to use\n'
+    printf ' -I <pkg>   Install a package into the working copy of the chroot\n'
+    printf ' -l <copy>  The directory to use as the working copy of the chroot\n'
+    printf '            Useful for maintaining multiple copies\n'
+    printf '            Default: %s\n' "$copy"
+    printf ' -n         Run namcap on the package\n'
+    printf ' -C         Run checkpkg on the package\n'
+    printf ' -N         Disable check() function\n'
+    printf ' -T         Build in a temporary directory\n'
+    printf ' -U         Run makepkg as a specified user\n'
     exit 1
 }
 
@@ -149,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=$?
@@ -182,7 +176,7 @@ prepare_chroot() {
         "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
     do
         grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
-        echo "$x" >>"$copydir/etc/makepkg.conf"
+        printf "%s\n" "$x" >>"$copydir/etc/makepkg.conf"
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
@@ -197,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
@@ -224,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=BUILDTOOLVER \
+        --preserve-env=BUILDTOOL \
+        --preserve-env=BUILDTOOLVER \
         -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
     ret=$?
     case $ret in
@@ -239,7 +233,7 @@ _chrootbuild() {
 _chrootnamcap() {
     pacman -S --needed --noconfirm namcap
     for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
-        echo "Checking ${pkgfile##*/}"
+        printf "Checking %s\n" "${pkgfile##*/}"
         sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
     done
 }
@@ -249,7 +243,7 @@ download_sources() {
     chown "$makepkg_user:" "$WORKDIR"
 
     # Ensure sources are downloaded
-    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
         env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
         makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
         die "Could not download sources."
@@ -295,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") ;;
@@ -313,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")
@@ -329,13 +323,14 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")
 
-# See if -R or -e was passed to makepkg
+# See if -R, -e or -A was passed to makepkg
 for arg in "${@:$OPTIND}"; do
     case ${arg%%=*} in
-        --skip*|--holdver) verifysource_args+=("$arg") ;;
+        --skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
         --repackage|--noextract) keepbuilddir=1 ;;
         --*) ;;
-        -*R*|-*e*) keepbuilddir=1 ;;
+        -*A*) verifysource_args+=(-A) ;;&
+        -*R*|-*e*) keepbuilddir=1 ;;&
     esac
 done
 
@@ -359,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=$?
@@ -383,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

@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+mk_tree_graph(){
+    printf "%s\n" "$(pactree "${tree_args[@]}" "${package}")" \
+        | dot -T "${ext}" > "${graph_dir}/${package}.${ext}"
+}
+
+mk_rebuild_graph(){
+    local tmpfile
+    tmpfile=/tmp/rebuild.dot
+    rebuild_args+=(-d "${tmpfile}")
+    artix-rebuild-order "${packages[@]}" "${rebuild_args[@]}"
+    dot -T "${ext}" "${tmpfile}" > "${graph_dir}/rebuild.${ext}"
+    rm -f "${tmpfile}"
+}
+
+usage() {
+    printf "Usage: %s [options] <package|packages>\n" "${0##*/}"
+    printf "    -m <tree|rebuild>    default mode: [%s]\n" "$mode"
+    printf "                         rebuild mode accepts packages input\n"
+    printf "    -r                   list packages that depend on the named package (tree)\n"
+    printf "    -u                   show dependencies with no duplicates  (tree)\n"
+    printf "    -d <#>               limit the depth of recursion  (tree)\n"
+    printf "                         default: [%s]\n" "$depth"
+    printf "    -o <#>               controls at which depth to stop printing optional deps\n"
+    printf "                         default: [%s]\n" "$optdepth"
+    printf "                         (-1 for no limit)  (tree)\n"
+    printf "    -i                   only use the pkgnames provided as input (rebuild)\n"
+    printf "    -h                   display this help message\n"
+    exit "$1"
+}
+
+graph_dir=${XDG_PICTURES_DIR:-$(xdg-user-dir PICTURES)/artix}
+ext="png"
+
+mode=tree
+
+tree_args=(-gs)
+rebuild_args=()
+
+depth=0
+optdepth=-1
+
+opts=':m:d:o:iruh'
+
+while getopts "$opts" arg; do
+    case "${arg}" in
+        m) mode="$OPTARG" ;;
+        r) tree_args+=(-r) ;;
+        u) tree_args+=(-ul) ;;
+        d) depth="$OPTARG"; tree_args+=(-d "$depth") ;;
+        o) optdepth="$OPTARG"; tree_args+=(-o"$optdepth") ;;
+        i) rebuild_args+=(--no-reverse-depends) ;;
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+[[ -d "${graph_dir}" ]] || mkdir -p "${graph_dir}"
+
+case "$mode" in
+    tree) package=("$@"); mk_tree_graph ;;
+    rebuild) packages=("$@"); mk_rebuild_graph ;;
+    *) usage 1 ;;
+esac

src/pkg/pkg2yaml.in

@@ -1,19 +1,16 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
-m4_include(lib/base/yaml.sh)
+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
 
@@ -32,6 +29,9 @@ srcyaml_write_attr(){
                 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
@@ -53,8 +53,8 @@ pkgbuild_extract_to_yaml() {
 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}")
+                                  optdepends makedepends checkdepends
+                                  "${known_hash_algos[@]/%/sums}")
 
     for attr in "${singlevalued[@]}"; do
         pkgbuild_extract_to_yaml "$1" "$attr" 0
@@ -76,87 +76,67 @@ srcyaml_write_section_details() {
 }
 
 yaml_write_global() {
-    local singlevalued=(pkgver pkgrel epoch url install changelog) #pkgdesc
+    local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog)
     local multivalued=(arch groups license checkdepends makedepends
-                    depends provides conflicts replaces)
-                    #noextract options backup optdepends
-                    #source validpgpkeys "${known_hash_algos[@]/%/sums}")
+                        depends optdepends provides conflicts replaces
+                        noextract options backup
+                        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_yaml_map 2 "name" "${pkgbase:-${pkgname}}")
+
+    srcyaml_write_section_details ""
 }
 
 yaml_write_package() {
-    local singlevalued=(url install changelog) #pkgdesc
-    local multivalued=(arch groups license checkdepends depends
-                    provides conflicts replaces) #options backup optdepends)
+    local singlevalued=(pkgdesc url install changelog)
+    local multivalued=(arch groups license checkdepends depends optdepends
+                       provides conflicts replaces options backup)
 
-    Yaml+=$(write_yaml_map 0 "packages")
+    Yaml+=$(write_yaml_map 0 "pkgnames")
     for pkg in "${pkgname[@]}"; do
         Yaml+=$(write_yaml_seq_map 2 "pkgname" "$pkg")
-        ${details} && srcyaml_write_section_details "$pkg"
+        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
-    pkgfile=$(print_all_package_names)
-    Yaml+=$(write_yaml_map 0 "files")
-    for f in ${pkgfile}; do
-        Yaml+=$(write_yaml_seq 2 "${f##*/}")
-    done
-    Yaml+=$(write_empty_line)
-}
-
-write_srcyaml(){
+write_srcyaml() {
     Yaml=$(write_yaml_header)
     yaml_write_global
     yaml_write_package
-    yaml_write_fileinfo
-    printf '%s' "${Yaml}"
+
+#     local version
+#     version=$(get_full_version)
+#     Yaml+=$(write_yaml_map 2 "version" "${version}")
+
+    printf '%s\n' "${Yaml}"
 }
 
 #}}}
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -d            Don't include details"
-    echo '    -h            This help'
-    echo ''
+    printf 'Usage: %s [options]\n' "${0##*/}"
+    printf '    -h            This help\n'
+    printf '\n'
     exit "$1"
 }
 
-details=true
+load_makepkg_config
 
-opts='dh'
+opts='h'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        d) details=false ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     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
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
+source "$srcpath"/PKGBUILD
 
 write_srcyaml

src/pkg/signpkg.in

@@ -1,19 +1,13 @@
 #!/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.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/deploy.sh)
+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