makerepropkg: use base.conf chroots_dir

mkchroot: unshare mount namespace to avoid broken root chroot creation

.github/workflows/lint.yaml

@@ -1,30 +0,0 @@
-name: Artools shellcheck
-run-name: ${{ gitea.actor }}
-on:
-  push:
-    branches:
-      - artools/0.33.x
-      - master
-    tags:
-      - 0.*
-  pull_request:
-    types: [opened, reopened]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@main
-      - name: build
-        run: make
-      - name: shellcheck
-        uses: ludeeus/action-shellcheck@master
-        env:
-          SHELLCHECK_OPTS: -x -e SC2034
-        with:
-          scandir: './build/bin'
-          format: tty
-          severity: error
-          additional_files: 'contrib/completion/bash/artools'
-

.gitignore

@@ -6,11 +6,3 @@ data/schemas/*.conf
 .project
 iso-profiles
 live-services
-artixpkg_cmds
-PKGBUILD
-
-contrib/artixlinux
-build/
-tmp/
-checks/
-check.sh

LICENSE

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

README.md

@@ -12,55 +12,39 @@ artools
 ##### Buildtime:
 
 * make
-* shellcheck
+* git
+* m4
 
 ##### Runtime:
 
 - base:
-  * awk
+  * os-prober
-  * bash
-  * coreutils
-  * grep
   * pacman
-  * util-linux
-  * sed
 
 - pkg:
-  * artools-base
+  * namcap
-  * binutils
+  * ruby-braid
-  * diffutils
-  * findutils
-  * go-yq
-  * openssh
-  * parallel
   * rsync
 
 - iso:
-  * artools-base
   * dosfstools
-  * e2fsprogs
-  * findutils
-  * grub
-  * libarchive
   * libisoburn
-  * mtools
   * squashfs-tools
-  * go-yq
+  * grub
-
 
 #### Configuration
 
-artools-{pkg,iso}.conf are the configuration files for artools.
+artools-{base,pkg,iso}.conf are the configuration files for artools.
 By default, the config files are installed in
 
 ```bash
-/etc/artools/artools-{pkg,iso}.conf
+/etc/artools/artools-{base,pkg,iso}.conf
 ```
 
-A user artools-{pkg,iso}.conf can be placed in
+A user artools-{base,pkg,iso}.conf can be placed in
 
 ```bash
-$HOME/.config/artools/artools-{pkg,iso}.conf
+$HOME/.config/artools/artools-{base,pkg,iso}.conf
 ```
 
 If the userconfig is present, artools will load the userconfig values, however, if variables have been set in the systemwide
@@ -69,31 +53,17 @@ These values take precedence over the userconfig.
 Best practise is to leave systemwide file untouched.
 By default it is commented and shows just initialization values done in code.
 
-Tools configuration is done in artools-{pkg,iso}.conf or by args.
+Tools configuration is done in artools-{base,pkg,iso}.conf or by args.
-Specifying args will override artools-{pkg,iso}.conf settings.
+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.conf.d/${arch}.conf
+usr/share/artools/{makepkg,pacman-*}.conf
-```
-
-```bash
-usr/share/artools/pacmanconf.d/${repo}-${arch}.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

@@ -0,0 +1,51 @@
+#!/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)
+
+
+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"
+}
+
+opts=':h'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+check_root
+
+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}" "$@"

bin/base/basestrap.in

@@ -0,0 +1,125 @@
+#!/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.
+
+#
+# Assumptions:
+#  1) User has partitioned, formatted, and mounted partitions on /mnt
+#  2) Network is functional
+#  3) Arguments passed to the script are valid pacman targets
+#  4) A valid mirror appears in /etc/pacman.d/mirrorlist
+#
+
+shopt -s extglob
+
+m4_include(lib/base/message.sh)
+m4_include(lib/base/mount.sh)
+m4_include(lib/base/chroot.sh)
+
+#{{{ functions
+
+copy_mirrorlist(){
+    cp -a /etc/pacman.d/mirrorlist "$1/etc/pacman.d/"
+}
+
+copy_keyring(){
+    if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $1/etc/pacman.d/gnupg ]]; then
+        cp -a /etc/pacman.d/gnupg "$1/etc/pacman.d/"
+    fi
+}
+
+create_min_fs(){
+    msg "Creating install root at %s" "$1"
+    mkdir -m 0755 -p "$1"/var/{cache/pacman/pkg,lib/pacman,log} "$1"/{dev,run,etc/pacman.d}
+    mkdir -m 1777 -p "$1"/tmp
+    mkdir -m 0555 -p "$1"/{sys,proc}
+}
+
+#}}}
+
+newroot=/mnt
+
+hostcache=0
+copykeyring=1
+copymirrorlist=1
+pacmode=-Sy
+
+usage() {
+    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"
+}
+
+opts=':C:cGiMU'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        C) pacman_conf=$OPTARG ;;
+        c) hostcache=1 ;;
+        i) interactive=1 ;;
+        G) copykeyring=0 ;;
+        M) copymirrorlist=0 ;;
+        U) pacmode=-U ;;
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+check_root
+
+(( $# )) || die "No root directory specified"
+newroot=$1; shift
+pacman_args=("${@:-base}")
+
+if (( ! hostcache ));then
+    pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
+fi
+
+if (( ! interactive )); then
+    pacman_args+=(--noconfirm)
+fi
+
+[[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
+
+[[ -d $newroot ]] || die "%s is not a directory" "$newroot"
+
+# create obligatory directories
+create_min_fs "$newroot"
+
+# mount API filesystems
+chroot_api_mount "$newroot" || die "failed to setup API filesystems in new root"
+
+if (( copykeyring ));then
+    copy_keyring "$newroot"
+fi
+
+msg2 'Installing packages to %s' "$newroot"
+if ! unshare --fork --pid pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then
+    die 'Failed to install packages to new root'
+fi
+
+
+if (( copymirrorlist ));then
+    copy_mirrorlist "$newroot"
+fi

bin/base/chroot-run.in

@@ -1,26 +1,29 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
-DATADIR=${DATADIR:-'@datadir@'}
+m4_include(lib/base/mount.sh)
-
+m4_include(lib/base/chroot.sh)
-# shellcheck source=src/lib/base/message.sh
+m4_include(lib/base/chroot-version.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 [[ -n "$flink" ]]; then
+        if [ "x$flink" != "x" ]; then
-            if [[ "${flink:0:${#prefix}}" == "$prefix" ]]; then
+            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
                 # this process is in the chroot...
                 pid=$(basename "$(dirname "$root_dir")")
                 name=$(ps -p "$pid" -o comm=)
@@ -37,9 +40,9 @@ kill_chroot_process(){
 umask 0022
 
 working_dir=''
-
 files=()
-mount_args="-B:/etc/hosts:/etc/hosts"
+
+mount_args=("-B:/etc/hosts:/etc/hosts")
 
 usage() {
     printf "Usage: %s [options] working-dir [run arguments]\n" "${0##*/}"
@@ -51,18 +54,13 @@ usage() {
     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 '    -t <opts>     tmpfs mount opts\n'
+    printf '    -b <list>     Bind mountargs\n'
-    printf '    -b <args>     Bind mountargs\n'
+    printf '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]\n'
-    printf '                  Format:\n'
-    printf '                  "arg1:src1:dest1 arg2:src2:dest2"\n'
     printf '    -h            This message\n'
     exit 1
 }
 
-# save all args for check_root
+opts='hC:M:c:b:f:s'
-orig_args=("$@")
-
-opts='hC:M:c:b:f:t:s'
 
 while getopts ${opts} arg; do
     case "${arg}" in
@@ -71,16 +69,15 @@ while getopts ${opts} arg; do
         c) cache_dirs+=("$OPTARG") ;;
         f) files+=("$OPTARG") ;;
         s) nosetarch=1 ;;
-        t) tmpfs_opts="$OPTARG" ;;
+        b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
-        b) bindmounts="$OPTARG"; mount_args+=" ${bindmounts}" ;;
         h|?) usage ;;
-        *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
 done
-shift $((OPTIND - 1))
+shift $(( OPTIND - 1 ))
 
 (( $# < 1 )) && die 'You must specify a directory.'
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+
+check_root
 
 working_dir=$(readlink -f "$1")
 shift 1
@@ -88,24 +85,23 @@ shift 1
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
 if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <(pacman-conf --config "${pacman_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
-mapfile -t host_mirrors < <(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#')
+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=SC2016
+        # 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')
-        for m in "$host_mirror"/pool/*/; do
+        in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
-            in_array "$m" "${cache_dirs[@]}" || cache_dirs+=("$m")
-        done
     fi
 done
 
 while read -r line; do
-    mapfile -t lines < <(pacman-conf --config "${pacman_conf:-$working_dir/etc/pacman.conf}" \
+    # shellcheck disable=2016
+    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
@@ -113,15 +109,7 @@ while read -r line; do
             in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
         fi
     done
-done < <(pacman-conf --config "${pacman_conf:-$working_dir/etc/pacman.conf}" --repo-list)
+done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
-
-mount_args+=" -B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}"
-
-for cache_dir in "${cache_dirs[@]:1}"; do
-    mount_args+=" -Br:${cache_dir//:/\\:}:${cache_dir//:/\\:}"
-done
-
-# {{{ functions
 
 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
@@ -129,9 +117,9 @@ copy_hostconf () {
 
     printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
 
-    [[ -n $pacman_conf ]] && cp "$pacman_conf" "$working_dir/etc/pacman.conf"
+    [[ -n $pacman_conf ]] && cp "$pacman_conf" "${working_dir}/etc/pacman.conf"
 
-    [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
+    [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "${working_dir}/etc/makepkg.conf"
 
     local file
     for file in "${files[@]}"; do
@@ -139,46 +127,48 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "${working_dir}/etc/pacman.conf"
 }
 
+mount_args+=("-B:${cache_dirs[0]//:/\\:}:${cache_dirs[0]//:/\\:}")
+
+for cache_dir in "${cache_dirs[@]:1}"; do
+    mount_args+=("-Br:${cache_dir//:/\\:}:${cache_dir//:/\\:}")
+done
+
 chroot_extra_mount() {
     chroot_add_resolv_conf "${working_dir}"
 
-    for arg in ${mount_args}; do
+    for arg in "${mount_args[@]}"; do
-        local flag dest src
+        local flag=${arg%%:*} dest=${arg##*:} src=${arg%:*}
-        flag=${arg%%:*}
-        dest=${arg##*:}
-        src=${arg%:*}
         src=${src#*:}
-        chroot_add_mount "${src}" "${working_dir}${dest}" "${flag}"
+        chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
     done
 }
 
-# }}}
-
 umask 0022
 
 # Sanity check
-if [[ ! -f "$working_dir/.artix-chroot" ]]; then
+if [[ ! -f "$working_dir/.artools" ]]; then
-    die "'%s' does not appear to be an Artix chroot." "$working_dir"
+    die "'%s' does not appear to be an artix chroot." "$working_dir"
-elif [[ $(cat "$working_dir/.artix-chroot") != "${CHROOTVERSION}" ]]; then
+elif [[ $(cat "$working_dir/.artools") != "${CHROOTVERSION}" ]]; then
     die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "${CHROOTVERSION}"
 fi
 
-chroot_setup "${working_dir}" "${tmpfs_opts}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"
+chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"
 
 chroot_extra_mount
 
 copy_hostconf
 
-eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
+eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
 [[ -z $nosetarch ]] || unset CARCH
-if [[ -f "${DATADIR}/setarch-aliases.d/${CARCH}" ]]; then
+
-    read -r set_arch < "${DATADIR}/setarch-aliases.d/${CARCH}"
+if [[ -f "@datadir@/artools/setarch-aliases.d/${CARCH}" ]]; then
+	read -r set_arch < "@datadir@/artools/setarch-aliases.d/${CARCH}"
 else
-    set_arch="${CARCH}"
+	set_arch="${CARCH}"
 fi
 
 ${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "$@"

bin/base/fstabgen.in

@@ -1,23 +1,28 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# 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
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
-
-# shellcheck source=src/lib/base/message.sh
-source "${LIBDIR}"/base/message.sh
 
 #{{{ filesystems
 
 declare -A pseudofs_types=([anon_inodefs]=1
-                        [apparmorfs]=1
                         [autofs]=1
                         [bdev]=1
-                        [binder]=1
-                        [binfmt_misc]=1
                         [bpf]=1
+                        [binfmt_misc]=1
                         [cgroup]=1
                         [cgroup2]=1
                         [configfs]=1
@@ -27,55 +32,31 @@ declare -A pseudofs_types=([anon_inodefs]=1
                         [devpts]=1
                         [devtmpfs]=1
                         [dlmfs]=1
-                        [dmabuf]=1
-                        [drm]=1
                         [efivarfs]=1
-                        [fuse]=1
-                        [fuse.archivemount]=1
-                        [fuse.avfsd]=1
-                        [fuse.dumpfs]=1
-                        [fuse.encfs]=1
                         [fuse.gvfs-fuse-daemon]=1
-                        [fuse.gvfsd-fuse]=1
-                        [fuse.lxcfs]=1
-                        [fuse.rofiles-fuse]=1
-                        [fuse.vmware-vmblock]=1
-                        [fuse.xwmfs]=1
                         [fusectl]=1
                         [hugetlbfs]=1
-                        [ipathfs]=1
                         [mqueue]=1
                         [nfsd]=1
                         [none]=1
-                        [nsfs]=1
-                        [overlay]=1
                         [pipefs]=1
                         [proc]=1
                         [pstore]=1
                         [ramfs]=1
-                        [resctrl]=1
                         [rootfs]=1
                         [rpc_pipefs]=1
                         [securityfs]=1
-                        [selinuxfs]=1
-                        [smackfs]=1
                         [sockfs]=1
                         [spufs]=1
                         [sysfs]=1
-                        [tmpfs]=1
+                        [tmpfs]=1)
-                        [tracefs]=1
-                        [vboxsf]=1
-                        [virtiofs]=1)
 
-declare -A fsck_types=([btrfs]=0    # btrfs doesn't need a regular fsck utility
+declare -A fsck_types=([cramfs]=1
-                    [cramfs]=1
-                    [erofs]=1
                     [exfat]=1
                     [ext2]=1
                     [ext3]=1
                     [ext4]=1
-                    [f2fs]=1
+                    [ext4dev]=1
-                    [fat]=1
                     [jfs]=1
                     [minix]=1
                     [msdos]=1
@@ -95,15 +76,11 @@ fstype_has_fsck() {
     (( fsck_types["$1"] ))
 }
 
-try_cast() (
-    _=$(( $1#$2 ))
-) 2>/dev/null
-
 valid_number_of_base() {
-    local base="$1" len=${#2} i
+    local base=$1 len=${#2} i
 
     for (( i = 0; i < len; i++ )); do
-        try_cast "$base" "${2:i:1}" || return 1
+        { _=$(( $base#${2:i:1} )) || return 1; } 2>/dev/null
     done
 
     return 0
@@ -111,6 +88,7 @@ valid_number_of_base() {
 
 mangle() {
     local i chr out
+
     local {a..f}= {A..F}=
 
     for (( i = 0; i < ${#1}; i++ )); do
@@ -129,6 +107,7 @@ mangle() {
 
 unmangle() {
     local i chr out len=$(( ${#1} - 4 ))
+
     local {a..f}= {A..F}=
 
     for (( i = 0; i < len; i++ )); do
@@ -155,6 +134,7 @@ dm_name_for_devnode() {
     else
         # don't leave the caller hanging, just print the original name
         # along with the failure.
+        print '%s' "$1"
         error 'Failed to resolve device mapper name for: %s' "$1"
     fi
 }
@@ -212,11 +192,19 @@ optstring_append_option() {
     optstring_normalize "$1"
 }
 
-optstring_get_option() {
+optstring_prepend_option() {
-    local _opts o
+    if ! optstring_has_option "$1" "$2"; then
+        declare -g "$1=$2,${!1}"
+    fi
 
-    IFS=, read -ra _opts <<<"${!1}"
+    optstring_normalize "$1"
-    for o in "${_opts[@]}"; do
+}
+
+optstring_get_option() {
+    local opts o
+
+    IFS=, read -ra opts <<<"${!1}"
+    for o in "${opts[@]}"; do
         if optstring_match_option "$2" "$o"; then
             declare -g "$o"
             return 0
@@ -233,7 +221,7 @@ optstring_has_option() {
 }
 
 write_source() {
-    local src="$1" spec label uuid comment=()
+    local src=$1 spec label uuid comment=()
 
     label=$(lsblk -rno LABEL "$1" 2>/dev/null)
     uuid=$(lsblk -rno UUID "$1" 2>/dev/null)
@@ -261,7 +249,7 @@ write_source() {
         ;;
     esac
 
-    [[ -n ${comment[*]} ]] && printf '# %s\n' "${comment[*]}"
+    [[ -n "${comment[*]}" ]] && printf '# %s\n' "${comment[*]}"
 
     if [[ $spec ]]; then
         printf '%-20s' "$bytag=$(mangle "$spec")"
@@ -286,27 +274,15 @@ optstring_apply_quirks() {
     fi
 
     case $fstype in
-        btrfs)
-            # Having only one of subvol= and subvolid= is enough for mounting a btrfs subvolume
-            # And having subvolid= set prevents things like 'snapper rollback' to work, as it
-            # updates the subvolume in-place, leaving subvol= unchanged with a different subvolid.
-            if optstring_has_option "$varname" subvol; then
-                optstring_remove_option "$varname" subvolid
-            fi
-        ;;
         f2fs)
-            # These are build-time or runtime-unchangeable options for f2fs.
+            # These are Kconfig options for f2fs. Kernels supporting the options will
-            # The former means that kernels supporting the options will only
+            # only provide the negative versions of these (e.g. noacl), and vice versa
-            # provide the negative versions of these (e.g. noacl), and vice versa
             # for kernels without support.
-            # The latter means that the options can only be specified/changed
+            optstring_remove_option "$varname" noacl,acl,nouser_xattr,user_xattr
-            # during the initial mount but not remount.
-            optstring_remove_option "$varname" noacl,acl,nouser_xattr,user_xattr,atgc
         ;;
         vfat)
             # Before Linux v3.8, "cp" is prepended to the value of the codepage.
-            # shellcheck disable=SC2154
+            if optstring_get_option "$varname" codepage && [[ "$codepage" = cp* ]]; then
-            if optstring_get_option "$varname" codepage && [[ $codepage = cp* ]]; then
                 optstring_remove_option "$varname" codepage
                 optstring_append_option "$varname" "codepage=${codepage#cp}"
             fi
@@ -321,12 +297,11 @@ usage() {
 usage: ${0##*/} [options] root
 
   Options:
-    -f <filter>    Restrict output to mountpoints matching the prefix FILTER
+    -f FILTER      Restrict output to mountpoints matching the prefix FILTER
     -L             Use labels for source identifiers (shortcut for -t LABEL)
     -p             Exclude pseudofs mounts (default behavior)
-    -P             Include pseudofs mounts
+    -P             Include printing mounts
-    -t <tag>       Use TAG for source identifiers (TAG should be one of: LABEL,
+    -t TAG         Use TAG for source identifiers
-                      UUID, PARTLABEL, PARTUUID)
     -U             Use UUIDs for source identifiers (shortcut for -t UUID)
 
     -h             Print this help message
@@ -364,6 +339,7 @@ if ! mountpoint -q "$root"; then
 fi
 
 # handle block devices
+findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root" |
 while read -r src target fstype opts fsroot; do
     if (( !pseudofs )) && fstype_is_pseudofs "$fstype"; then
         continue
@@ -376,7 +352,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...
@@ -391,7 +367,6 @@ while read -r src target fstype opts fsroot; do
     if [[ $fsroot != / && $fstype != btrfs ]]; then
         # it's a bind mount
         src=$(findmnt -funcevo TARGET "$src")$fsroot
-        src="/${src#"$root"/}"
         if [[ $src -ef $target ]]; then
             # hrmm, this is weird. we're probably looking at a file or directory
             # that was bound into a chroot from the host machine. Ignore it,
@@ -407,14 +382,14 @@ while read -r src target fstype opts fsroot; do
     # filesystem quirks
     case $fstype in
         fuseblk)
-            # well-behaved FUSE filesystems will report themselves as fuse.$fstype.
+        # well-behaved FUSE filesystems will report themselves as fuse.$fstype.
-            # this is probably NTFS-3g, but let's just make sure.
+        # this is probably NTFS-3g, but let's just make sure.
-            if ! newtype=$(lsblk -no FSTYPE "$src") || [[ -z $newtype ]]; then
+        if ! newtype=$(lsblk -no FSTYPE "$src") || [[ -z $newtype ]]; then
-                # avoid blanking out fstype, leading to an invalid fstab
+            # avoid blanking out fstype, leading to an invalid fstab
-                error 'Failed to derive real filesystem type for FUSE device on %s' "$target"
+            error 'Failed to derive real filesystem type for FUSE device on %s' "$target"
-            else
+        else
-                fstype=$newtype
+            fstype=$newtype
-            fi
+        fi
         ;;
     esac
 
@@ -425,7 +400,7 @@ while read -r src target fstype opts fsroot; do
     printf '\t%-10s' "/$(mangle "${target#/}")" "$fstype" "$opts"
     printf '\t%s %s' "$dump" "$pass"
     printf '\n\n'
-done < <(findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root")
+done
 
 # handle swaps devices
 {
@@ -441,11 +416,8 @@ done < <(findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root")
         # skip files marked deleted by the kernel
         [[ $device = *'\040(deleted)' ]] && continue
 
-        # skip devices not part of the prefix
-        [[ $device = "$prefixfilter"* ]] || 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

bin/base/mkchroot.in

@@ -1,26 +1,26 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
-
+m4_include(lib/base/chroot.sh)
-# shellcheck source=src/lib/base/message.sh
+m4_include(lib/base/chroot-version.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=''
 
 files=()
 chroot_args=()
-nosetarch=0
 
 usage() {
     printf "Usage: %s [options] working-dir package-list...\n" "${0##*/}"
@@ -35,8 +35,6 @@ usage() {
     exit 1
 }
 
-orig_args=("$@")
-
 opts='hUC:M:c:f:s'
 
 while getopts ${opts} arg; do
@@ -58,7 +56,7 @@ shift $(( OPTIND - 1 ))
 
 (( $# < 2 )) && die 'You must specify a directory and one or more packages.'
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 working_dir="$(readlink -f "$1")"
 shift 1
@@ -66,7 +64,7 @@ shift 1
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
 if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <(pacman-conf CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi
 
 umask 0022
@@ -95,10 +93,10 @@ done
 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"
+printf '%s.UTF-8 UTF-8\n' C en_US de_DE > "$working_dir/etc/locale.gen"
 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/.artix-chroot"
+printf "%s\n" "${CHROOTVERSION}" > "$working_dir/.artools"
 
 dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 

bin/iso/buildiso.in

@@ -1,41 +1,35 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/util-base.sh)
-DATADIR=${DATADIR:-'@datadir@'}
+m4_include(lib/util-iso.sh)
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+m4_include(lib/base/message.sh)
-
+m4_include(lib/base/common.sh)
-# shellcheck source=src/lib/iso/util.sh
+m4_include(lib/base/chroot.sh)
-source "${LIBDIR}"/iso/util.sh
+m4_include(lib/iso/mount.sh)
-# shellcheck source=src/lib/base/message.sh
+m4_include(lib/iso/services.sh)
-source "${LIBDIR}"/base/message.sh
+m4_include(lib/base/yaml.sh)
-# shellcheck source=src/lib/base/chroot.sh
+m4_include(lib/iso/calamares.sh)
-source "${LIBDIR}"/base/chroot.sh
+m4_include(lib/iso/config.sh)
-# shellcheck source=src/lib/iso/mount.sh
+m4_include(lib/iso/firmware.sh)
-source "${LIBDIR}"/iso/mount.sh
+m4_include(lib/iso/dracut.sh)
-# shellcheck source=src/lib/iso/services.sh
+m4_include(lib/iso/initcpio.sh)
-source "${LIBDIR}"/iso/services.sh
+m4_include(lib/iso/grub.sh)
-# shellcheck source=src/lib/iso/calamares.sh
+m4_include(lib/iso/squash.sh)
-source "${LIBDIR}"/iso/calamares.sh
+m4_include(lib/iso/iso.sh)
-# shellcheck source=src/lib/iso/config.sh
+m4_include(lib/iso/profile.sh)
-source "${LIBDIR}"/iso/config.sh
+m4_include(lib/iso/trap.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"
@@ -66,7 +60,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
@@ -88,15 +82,9 @@ make_rootfs() {
         msg "Prepare [Base installation] (rootfs)"
         local rootfs="${work_dir}/rootfs"
 
-        load_pkgs "${root_list}"
-
         prepare_dir "${rootfs}"
 
-        local args=()
+        basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
-        if "${copy_pacconf}"; then
-            args+=(-P)
-        fi
-        basestrap "${basestrap_args[@]}" "${args[@]}" "${rootfs}" "${packages[@]}"
 
         copy_overlay "${root_overlay}" "${rootfs}"
 
@@ -115,8 +103,6 @@ make_livefs() {
         msg "Prepare [Live installation] (livefs)"
         local livefs="${work_dir}/livefs"
 
-        load_pkgs "${live_list}"
-
         prepare_dir "${livefs}"
 
         mount_overlayfs "${livefs}" "${work_dir}"
@@ -141,8 +127,6 @@ make_bootfs() {
     if [[ ! -e ${work_dir}/bootfs.lock ]]; then
         msg "Prepare [/iso/boot]"
 
-        load_pkgs "${common_dir}/Packages-boot"
-
         prepare_dir "${iso_root}/boot"
 
         cp "${work_dir}"/rootfs/boot/vmlinuz* "${iso_root}"/boot/vmlinuz-"${arch}"
@@ -154,7 +138,6 @@ make_bootfs() {
         if "${use_dracut}"; then
             prepare_initramfs_dracut "${bootfs}"
         else
-            basestrap "${basestrap_args[@]}" "${bootfs}" "${packages[@]}"
             prepare_initramfs_mkinitcpio "${bootfs}"
         fi
 
@@ -190,8 +173,8 @@ gen_iso_fn(){
     local vars=("artix") name
     vars+=("${profile}")
     vars+=("${INITSYS}")
-    case "${STABILITY}" in
+    case "${repo}" in
-        gremlins|goblins) vars+=("${STABILITY}") ;;
+        'gremlins'|'goblins') vars+=("${repo}") ;;
     esac
     vars+=("${ISO_VERSION}")
     vars+=("${arch}")
@@ -201,23 +184,15 @@ gen_iso_fn(){
     printf "%s\n" "$name"
 }
 
-export_gpg_publickey() {
-    key_export="${WORKSPACE_DIR}"/pubkey.gpg
-    gpg --batch  --no-armor --output "${key_export}" --export "${GPG_KEY}"
-}
-
 prepare_build(){
     load_profile
-    local pac_conf
 
-    pac_conf=iso-${arch}.conf
+    case "${repo}" in
-    if [[ "${STABILITY}" != 'stable' ]]; then
+        'gremlins'|'goblins') repo="${repo}" ;;
-        pac_conf=iso-${STABILITY}-${arch}.conf
+        *) repo=default ;;
-    fi
+    esac
-    pacman_conf="${DATADIR}/pacman.conf.d/${pac_conf}"
+
-    if [[ -f "${USER_CONF_DIR}/pacman.conf.d/${pac_conf}" ]]; then
+    get_pacman_conf "${repo}"
-        pacman_conf="${USER_CONF_DIR}/pacman.conf.d/${pac_conf}"
-    fi
 
     iso_file=$(gen_iso_fn).iso
 
@@ -267,7 +242,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}"
@@ -279,8 +254,10 @@ mk_boot(){
 }
 
 mk_chroots(){
+    load_pkgs "${root_list}"
     run_safe "make_rootfs"
     if [[ -n ${live_list} ]]; then
+        load_pkgs "${live_list}"
         run_safe "make_livefs"
     fi
 }
@@ -337,25 +314,21 @@ persist=false
 use_dracut=false
 squash_only=false
 boot_only=false
-copy_pacconf=false
 
 basestrap_args=(-GMc)
 cmd=${0##*/}
 
+repo=${cmd##*-}
 owner=${SUDO_USER:-$USER}
 profile='base'
 chroots_iso="${CHROOTS_DIR}/buildiso"
-arch=${ARCH}
+arch=$(uname -m)
 
 usage() {
     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 '    -R <stability>     Build stability\n'
-    printf '                       [default: %s]\n' "${STABILITY}"
-    printf '    -a <arch>          Build arch\n'
-    printf '                       [default: %s]\n' "${arch}"
     printf '    -t <dir>           Target directory\n'
     printf '                       [default: %s]\n' "${ISO_POOL}"
     printf '    -i <name>          Init system to use\n'
@@ -370,7 +343,6 @@ usage() {
     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 '    -w                 Copy the pacman.conf used to the rootfs\n'
     printf '    -q                 Query settings and pretend build\n'
     printf '    -h                 This help\n'
     printf '\n'
@@ -378,15 +350,11 @@ usage() {
     exit "$1"
 }
 
-orig_args=("$@")
+opts='p:r:t:i:g:czsbxmdqh'
-
-opts='p:r:R:t:i:g:a:czsbxwmdqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) profile="$OPTARG" ;;
-        a) arch="$OPTARG" ;;
-        R) STABILITY="$OPTARG" ;;
         r) chroots_iso="$OPTARG" ;;
         t) ISO_POOL="$OPTARG" ;;
         i) INITSYS="$OPTARG" ;;
@@ -398,7 +366,6 @@ while getopts "${opts}" arg; do
         b) boot_only=true ;;
         m) persist=true ;;
         d) use_dracut=true ;;
-        w) copy_pacconf=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
     esac
@@ -410,7 +377,7 @@ prepare_build
 
 ${pretend} && display_settings && exit 1
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 prepare_dir "${mnt_dir}"
 prepare_dir "${iso_dir}"

bin/pkg/batchpkg.in

@@ -0,0 +1,114 @@
+#!/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}" -p "${pkg}"
+        else
+            msg "%s" "${dest}pkg -s ${src} -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 -p "${pkg}"
+        else
+            msg "buildtree -i -p ${pkg}"
+            msg2 "${dest}pkg -p ${pkg}"
+        fi
+    done < "$pkglist"
+}
+
+#}}}
+
+usage() {
+    printf 'Usage: %s [optional listname]\n' "${0##*/}"
+    printf '    -r                 Run generated commands\n'
+    printf '    -c                 Create pkgrepos from list\n'
+    printf '    -u                 Update pkgrepos from list\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    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 ;;
+    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

@@ -0,0 +1,120 @@
+#!/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() {
+    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') ;;
+        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

@@ -0,0 +1,334 @@
+#!/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
+
+pkgrepo_new(){
+    cd "${TREE_DIR_ARTIX}/${group}" || return
+
+    local org gitname
+    org=$(get_pkg_org "${package}")
+    gitname=$(get_compliant_name "${package}")
+
+    if [[ ! -d "${package}" ]]; then
+        gitearepo -cr "$gitname"
+
+        add_team_to_repo "$gitname" "$org" "${team}"
+
+        msg2 "Adding [%s] from (%s)" "${package}" "$org/$gitname"
+        braid add "${GIT_SSH}":"$org/$gitname".git "${package}"
+
+        prepare_dir "${TREE_DIR_ARTIX}/${group}/${package}/trunk"
+
+        commit_ci "${package}"
+
+#         if braid push "${package}"; then
+#             braid update "${package}"
+#         fi
+    else
+        die "Package %s already exists!" "${package}"
+    fi
+}
+
+#}}}
+
+#{{{ pull
+
+config_tree() {
+    local dist="$1" vars="${2:-false}"
+    case "$dist" in
+        Artix)
+            if "$vars"; then
+                dist_tree=("${ARTIX_TREE[@]}")
+                dist_url="${GIT_SSH}:pkgbuild"
+                dist_dir=${TREE_DIR_ARTIX}
+            else
+                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
+            fi
+        ;;
+        Arch)
+            if "$vars"; then
+                dist_tree=("${ARCH_TREE[@]}")
+                dist_url="${HOST_TREE_ARCH}"
+                dist_dir=${TREE_DIR_ARCH}
+            else
+                git config --bool pull.rebase false
+                git config branch.master.mergeoptions --no-edit
+            fi
+        ;;
+    esac
+}
+
+update_tree() {
+    local dist="${1:-Artix}"
+    config_tree "$dist" true
+    cd "$dist_dir" || return
+    for tree in "${dist_tree[@]}"; do
+        if [[ -d "$tree" ]]; then
+            ( cd "$tree" || return
+                config_tree "$dist"
+                msg "Checking (%s) (%s)" "$tree" "$dist"
+                pull_tree "$tree" "$(get_local_head)"
+            )
+        else
+            msg "Cloning (%s) (%s) ..." "$tree" "$dist"
+            git clone "$dist_url/$tree".git
+            ( cd "$tree" || return
+                config_tree "$dist"
+            )
+        fi
+    done
+}
+
+#}}}
+
+#{{{ patch
+
+set_maintainer() {
+    local name email path="$1"
+    name=$(git config --get user.name)
+    email=$(git config --get user.email)
+    sed -e "1s|Maintainer:.*|Maintainer: $name <$email>|" \
+        -i "$path"/PKGBUILD
+}
+
+patch_pkg(){
+    local pkgpath="$1"
+    local pkg=${pkgpath%/*}
+    pkg=${pkg##*/}
+    sed -e 's|arch-meson|artix-meson|' -i "$pkgpath"/PKGBUILD
+    set_maintainer "$pkgpath"
+    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/repos/$repo
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
+
+    show_deps "$archpath"
+
+    if [[ -f "$artixpath"/Jenkinsfile ]]; 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/repos/$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} && update_tree "Arch"
+    ${sync_artix} && update_tree
+}
+
+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
+check=false
+
+package=''
+
+team='community'
+group="${ARTIX_TREE[0]}"
+
+usage() {
+    printf "Usage: %s [options]\n" "${0##*/}"
+    printf '    -p <pkg>      Package name\n'
+    printf '    -t <team>     Team name (only with -n)\n'
+    printf '                  Possible values: core,extra,community,multilib\n'
+    printf "                  [default: %s]\n" "${team}"
+    printf '    -g <group>    Group name, the superrepo (only with -n)\n'
+    printf "                  [default: %s]\n" "${group}"
+    printf "    -s            Clone or pull repos\n"
+    printf "    -a            Don't clone or pull arch repos\n"
+    printf "    -b            Don't clone or pull artix repos\n"
+    printf '    -i            Import a package from arch repos\n'
+    printf '    -n            New remote pkgrepo and add it\n'
+    printf '    -v            Check if a package is in the artix tree(s)\n'
+    printf '    -c            View package depends\n'
+    printf '    -x            Exclude testing (only with -i)\n'
+    printf '    -y            Exclude staging (only with -i)\n'
+    printf '    -z            Include kde & gnome unstable (only with -i)\n'
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+opts='p:t:g:sinabcvxyzh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        p) package="$OPTARG" ;;
+        t) team="$OPTARG" ;;
+        g) group="$OPTARG" ;;
+        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 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+set_arch_repos "$testing" "$staging" "$unstable"
+
+${sync} && sync_repos
+
+${view} && view_build
+
+${check} && check_tree
+
+${import} && from_arch
+
+${createnew} && pkgrepo_new

bin/pkg/checkpkg.in

@@ -1,13 +1,21 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/diff.sh)
 
-# shellcheck source=src/lib/base/message.sh
+shopt -s extglob
-source "${LIBDIR}"/base/message.sh
-# shellcheck source=src/lib/pkg/diff.sh
-source "${LIBDIR}"/pkg/diff.sh
 
 load_makepkg_config
 
@@ -23,71 +31,46 @@ usage() {
         list for both packages and a library list for both packages.
 
         OPTIONS
-            -r, --rmdir          Remove the temporary directory
+            -r, --rmdir     Remove the temporary directory
-            -w, --warn           Print a warning in case of differences
+            -w, --warn      Print a warning in case of differences
-            -M, --makepkg-config Set an alternate makepkg configuration file
+            -h, --help      Show this help text
-            -h, --help           Show this help text
 _EOF_
 }
 
 RMDIR=0
 WARN=0
-MAKEPKG_CONF=/etc/makepkg.conf
 
-# option checking
+OPT_SHORT='rwh'
-while (( $# )); do
+OPT_LONG=('rmdir' 'warn' 'help')
+if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
+    exit 1
+fi
+set  -- "${OPTRET[@]}"
+
+while :; do
     case $1 in
+        -r|--rmdir)
+            RMDIR=1
+            ;;
+        -w|--warn)
+            WARN=1
+            ;;
         -h|--help)
             usage
             exit 0
             ;;
-        -r|--rmdir)
-            RMDIR=1
-            shift
-            ;;
-        -w|--warn)
-            WARN=1
-            shift
-            ;;
-        -M|--makepkg-config)
-            MAKEPKG_CONF="$2"
-            shift 2
-            ;;
         --)
-            shift
+            shift; break
-            break
-            ;;
-        --*|-*)
-            die "invalid argument: %s" "$1"
-            ;;
-        *)
-            break
             ;;
     esac
+    shift
 done
 
-# 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=config/makepkg/x86_64.conf
-    source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
-elif [[ -r "$HOME/.makepkg.conf" ]]; then
-    # shellcheck source=config/makepkg/x86_64.conf
-    source "$HOME/.makepkg.conf"
-fi
-
 if [[ ! -f PKGBUILD ]]; then
     die 'This must be run in the directory of a built package.'
 fi
 
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
+# shellcheck source=PKGBUILD.proto
 . ./PKGBUILD
 if [[ ${arch[0]} == 'any' ]]; then
     CARCH='any'
@@ -97,8 +80,6 @@ STARTDIR=$(pwd)
 (( RMDIR )) && trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
 TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
 
-changed=0
-
 for _pkgname in "${pkgname[@]}"; do
     comparepkg=$_pkgname
     pkgurl=
@@ -111,10 +92,8 @@ for _pkgname in "${pkgname[@]}"; do
 
     if (( $# )); then
         case $1 in
-            *://*)
-                pkgurl=$1 ;;
             /*|*/*)
-                pkgurl=$(readlink -m "$1") ;;
+                pkgurl=file://$(readlink -m "$1") ;;
             *.pkg.tar*)
                 pkgurl=$1 ;;
             '')
@@ -152,21 +131,11 @@ for _pkgname in "${pkgname[@]}"; do
     find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"
     if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
         message="Sonames differ in $_pkgname!"
-        if (( WARN )); then
+        (( WARN )) && warning "$message" || msg "$message"
-            warning "$message"
+        printf "%s\n" "$diff_output"
-        else
-            msg "$message"
-        fi
-        printf "%s\n" "$diff_output" 2>&1 | tee "${pkgfile##*/}-checkpkg.log"
-        changed=1
     else
         msg "No soname differences for %s." "$_pkgname"
     fi
 done
 
-if ! (( RMDIR )); then
+(( RMDIR )) || msg "Files saved to %s" "$TEMPDIR"
-    msg "Files saved to %s" "$TEMPDIR"
-fi
-
-exit "$changed"
-

bin/pkg/checkrepo.in

@@ -0,0 +1,250 @@
+#!/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)
+
+#{{{ db libs
+
+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_db_cache(){
+    msg "Updating database cache ..."
+    local cachedir url
+    for repo in "${searchrepos[@]}"; 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() {
+    for repo in "${searchrepos[@]}"; 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
+}
+
+#}}}
+
+#{{{ check db
+
+is_db_entry() {
+    local pkgname="$1" repo="${REPOS[$2]}" entry
+    entry=${db_cache_dir}/linksdb/$repo/$pkgname
+
+    if [[ -d "$entry" ]];then
+        return 0
+    fi
+    return 1
+}
+
+check_db(){
+    local pkgpath="${1}"
+
+    for repo in "${!REPOS[@]}"; do
+
+        local pkgbuild artixver
+        if [[ -f $pkgpath/$repo/PKGBUILD ]]; then
+            pkgbuild=$pkgpath/$repo/PKGBUILD
+
+            # shellcheck disable=1090
+            . "$pkgbuild" 2>/dev/null
+            artixver=$(get_full_version)
+            for name in "${pkgname[@]}"; do
+                if ! is_db_entry "$name-$artixver" "$repo"; then
+                    msg_row_red "${tableU}" "$repo" "$name" "$artixver" "false"
+                else
+                    ${all_db} && msg_row "${tableU}" "$repo" "$name" "$artixver" "true"
+                fi
+            done
+            unset artixver pkgbuild pkgver epoch pkgname pkgbase
+        fi
+    done
+}
+
+#}}}
+
+# {{{ check obsolete
+
+show_obsolete_table() {
+    local arch_mirror='https://mirror.f4st.host/archlinux'
+
+    local arch_repo artix_repo artix_db arch_db url
+    arch_repo="${searchrepos[@]}"
+    artix_repo="${REPOS[$arch_repo]}"
+
+    artix_db="${db_cache_dir}/artixdb/${artix_repo}"
+    arch_db="${db_cache_dir}/archdb/${arch_repo}"
+
+    msg "Updating database cache ..."
+    url=${REPOS_MIRROR}/${artix_repo}/os/$CARCH/${artix_repo}.${db_ext}
+    extract_db "$url" "${artix_db}"
+
+    url=${arch_mirror}/${arch_repo}/os/$CARCH/${arch_repo}.${db_ext}
+    extract_db "$url" "${arch_db}"
+    msg "Done"
+
+    msg_table_header "${tableQ}" "Repo" "Package" "Obsolete"
+    for p in "${artix_db}"/*; do
+        local pkg rel
+        pkg=${p##*/}
+        rel=${pkg##*-}
+        rel=${rel%.*}
+        pkg=${pkg%-*}
+        local p="$pkg-$rel"
+
+        if [[ "$p" != *openrc* ]] && [[ "$p" != *runit* ]] \
+        && [[ "$p" != *s6* ]] && [[ "$p" != *suite66* ]] \
+        && [[ "$p" != *udev* ]] && [[ "$p" != *elogind* ]] \
+        && [[ "$p" != *sysusers* ]] && [[ "$p" != *tmpfiles* ]] \
+        && [[ "$p" != *execline* ]] && [[ "$p" != *skalibs* ]] \
+        && [[ "$p" != *netifrc* ]] && [[ "$p" != *bootlogd* ]] \
+        && [[ "$p" != *pam_rundir* ]] && [[ "$p" != *artools* ]] \
+        && [[ "$p" != *archlinux* ]] && [[ "$p" != *iso-profiles* ]] \
+        && [[ "$p" != *calamares* ]] && [[ "$p" != *iso-initcpio* ]] \
+        && [[ "$p" != *dinit* ]] && [[ "$p" != *artix* ]] && [[ "$p" != *blocaled* ]]; then
+            if [[ ! -d "${arch_db}/$p" ]]; then
+                msg_row "${tableQ}" "${artix_repo}" "$p" "true"
+            fi
+        fi
+    done
+}
+
+#}}}
+
+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
+}
+
+db_cache_dir="${XDG_CACHE_HOME:-$USER_HOME/.cache}/artools"
+
+linksdb_ext="links.tar.${DBEXT}"
+db_ext="db.tar.${DBEXT}"
+
+load_makepkg_config
+
+sync=false
+check=false
+query=false
+all_db=false
+obsolete=false
+
+readonly tableU="%-20s %-35s %-30s %-10s"
+readonly tableQ="%-20s %-55s %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() {
+    printf "Usage: %s [options] (with -q [libname])\n" "${0##*/}"
+    printf '    -r <repo>     Repo name to query\n'
+    printf '                  [default: all]\n'
+    printf "    -s            Sync repo databases\n"
+    printf '    -c            Check repos\n'
+    printf '    -a            Show repo db (-c)\n'
+    printf '    -o            Check for obsolete packages\n'
+    printf "    -q            Query repo databases for so libs\n"
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+opts='r:qcsaoh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        r) searchrepos=("$OPTARG") ;;
+        s) sync=true ;;
+        c) check=true ;;
+        a) all_db=true ;;
+        q) query=true ;;
+        o) obsolete=true ;;
+        h|?) usage 0 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+library="$1"; shift
+
+${sync} && update_db_cache
+
+${check} && show_db_table
+
+${query} && show_lib_table
+
+${obsolete} && show_obsolete_table

bin/pkg/commitpkg.in

@@ -0,0 +1,204 @@
+#!/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
+
+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
+
+    # shellcheck disable=1090
+    . "$pkgbuild"
+}
+
+get_repo_commit_msg() {
+    printf "[%s] -> [%s] '%s' %s\n" "${repo_src}" "${repo_dest}" "${package}-$(get_full_version)" "${action}"
+}
+
+get_commit_msg() {
+    printf "[%s] '%s' %s\n" "${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
+            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
+
+    [[ -d "$CARCH/${repo_dest}" ]] && git rm -r "$CARCH/${repo_dest}"
+    [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
+    [[ ! -d "$CARCH/${repo_dest}" ]] && mkdir "$CARCH/${repo_dest}"
+
+    if [[ "${repo_src}" == 'trunk' ]]; then
+        action='add'
+        commit_msg=$(get_repo_commit_msg)
+        msg "Action: %s" "$commit_msg"
+        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"
+        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 tree
+    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${package}")
+    if [[ -n ${artixpath} ]];then
+        tree=${artixpath%/*}
+        cd "$tree" || return
+        head=$(get_local_head)
+
+        cd "${artixpath}" || return
+
+        path_config
+
+        if [[ "${cmd}" == 'commitpkg' ]];then
+            commit_pkg
+        else
+            repo_commit_pkg
+        fi
+
+        cd "$tree" || return
+
+        msg "Checking (%s) (Artix)" "${tree##*/}"
+        pull_tree "${tree##*/}" "$head"
+
+        if braid push "${package}"; then
+            braid update "${package}"
+            msg "Update (%s)" "${tree##*/}"
+            git push origin master
+            git prune
+            [[ "${cmd}" != 'commitpkg' ]] && check_team
+        else
+            warning "'braid push %s' failed.\n" "${package}"
+        fi
+    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
+
+pkgbuild=trunk/PKGBUILD
+
+cmd=${0##*/}
+repo_dest=${cmd%pkg}
+
+usage() {
+    printf "Usage: %s [options]\n" "${0##*/}"
+    printf "    -s <name>          Source repository [default: %s]\n" "${repo_src}"
+    printf '    -p <pkg>           Package name\n'
+    printf '    -r                 Delete from repo (commitpkg only)\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+opts='p:s:rh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        s) repo_src="$OPTARG" ;;
+        p) package="$OPTARG" ;;
+        r) remove=true ;;
+        h|?) usage 0 ;;
+    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

@@ -0,0 +1,209 @@
+#!/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
+}
+
+get_group() {
+    local group
+    group="${artixpath%/*}"
+    group=${group##*/}
+    printf "%s\n" "${group#*-}"
+}
+
+compare_m(){
+#     if [ "$result" -eq 0 ];then
+        case "$artixrepo" in
+            *testing*|*staging*|*rebuild)
+                if [[ "${archrepo}" == "${artixrepo}" ]]; then
+                    msg_row "${table}" "${archrepo}" "${artixrepo}" "$pkg" "$archver" "$artixver" "$(get_group)"
+                elif [[ "${archrepo}" == 'staging' && "${artixrepo}" == 'rebuild' ]]; then
+                    msg_row_yellow "${table}" "${archrepo}" "${artixrepo}" "$pkg" "$archver" "$artixver" "$(get_group)"
+                else
+                    msg_row_green "${table}" "${archrepo}" "${artixrepo}" "$pkg" "$archver" "$artixver" "$(get_group)"
+                    if [[ -n "${archrepo}" ]]; then
+                        write_list "${archrepo}:${artixrepo}:$pkg" pkg_moves
+                    else
+                        write_list "@repo@:${artixrepo}:$pkg" artix
+                    fi
+                fi
+            ;;
+        esac
+#     fi
+}
+
+compare_u(){
+    if [ "$result" -eq -1 ];then
+#         local arel=${archver##*-} brel=${artixver##*-}
+#         local reldiff
+#         reldiff=$(( $arel-${brel%.*} ))
+        msg_row_red "${table}" "${archrepo}" "${artixrepo}" "$pkg" "$archver" "$artixver" "$(get_group)"
+        write_list "${archrepo}:$pkg" pkg_upgrades
+    fi
+}
+
+compare_d(){
+    if [ "$result" -eq 1 ];then
+        if [[ -n "$archver" ]] && [[ -n "${archrepo}" ]];then
+            msg_row_yellow "${table}" "${archrepo}" "${artixrepo}" "$pkg" "$archver" "$artixver" "$(get_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
+    printf "%s\n" "$archpath"
+}
+
+pre_compare(){
+    local artixpath="$1" func="$2" pkg
+    pkg=${artixpath##*/}
+
+    local artixrepo archrepo pkgbuild artixver archver archpath epoch
+
+    artixrepo=$(find_repo "$artixpath")
+    pkgbuild=$artixpath/$CARCH/$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/repos/$archrepo/PKGBUILD
+        archrepo="${archrepo%-*}"
+
+        if [[ -f "$pkgbuild" ]]; then
+            # shellcheck disable=1090
+            . "$pkgbuild" 2>/dev/null
+            archver=$(get_full_version)
+        fi
+
+        local result
+        result=$(vercmp "$artixver" "$archver")
+
+        "$func"
+    fi
+}
+
+compare_upgrades(){
+    local artixpath="${1%/*}"
+    pre_compare "$artixpath" compare_u
+}
+
+compare_downgrades(){
+    local artixpath="${1%/*}"
+    pre_compare "$artixpath" compare_d
+}
+
+compare_move(){
+    local artixpath="${1%/*}"
+    pre_compare "$artixpath" compare_m
+}
+
+#}}}
+
+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 %-29s %-27s %-27s %-7s"
+
+usage() {
+    printf 'Usage: %s [options]\n' "${0##*/}"
+    printf '    -u            Show upgrade packages\n'
+    printf '    -d            Show downgrade packages\n'
+    printf '    -m            Show packages to move\n'
+    printf '    -x            Do not inlcude testing packages\n'
+    printf '    -y            Do not inlcude staging packages\n'
+    printf '    -z            Include unstable kde and gnome\n'
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
+    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 ;;
+    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

@@ -0,0 +1,100 @@
+#!/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() {
+    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 '    -l                 Use links db\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    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 ;;
+    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/diffpkg.in

@@ -2,12 +2,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+shopt -s extglob
 
-# shellcheck source=src/lib/base/message.sh
+m4_include(lib/base/message.sh)
-source "${LIBDIR}"/base/message.sh
+m4_include(lib/pkg/diff.sh)
-# shellcheck source=src/lib/pkg/diff.sh
-source "${LIBDIR}"/pkg/diff.sh
 
 usage() {
     cat <<- _EOF_
@@ -39,19 +37,12 @@ _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
@@ -60,7 +51,6 @@ while (( $# )); do
             exit 0
         ;;
         -M|--makepkg-config)
-            (( $# <= 1 )) && die "missing argument for %s" "$1"
             MAKEPKG_CONF="$2"
             shift 2
         ;;
@@ -84,50 +74,11 @@ while (( $# )); do
             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"
         ;;
         *)
@@ -136,29 +87,13 @@ while (( $# )); do
     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
+	TARLIST=1
 fi
 
 # Source makepkg.conf; fail if it is not found
 if [[ -r "${MAKEPKG_CONF}" ]]; then
-    # shellcheck source=config/makepkg/x86_64.conf
+    # shellcheck source=makepkg-x86_64.conf
     source "${MAKEPKG_CONF}"
 else
     die "${MAKEPKG_CONF} not found!"
@@ -186,19 +121,6 @@ tar_list() {
     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")
@@ -207,46 +129,32 @@ diff_pkgs() {
     [[ -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 "$oldpkg" > "$TMPDIR/filelist-old"
-        tar_list "$newpkg" > "$TMPDIR/new"
+        tar_list "$newpkg" > "$TMPDIR/filelist"
+
+        sdiff -s "$TMPDIR/filelist-old" "$TMPDIR/filelist"
     fi
 
     if (( PKGINFO )); then
-        bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
+        bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/pkginfo-old"
-        bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
+        bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/pkginfo"
+
+        sdiff -s "$TMPDIR/pkginfo-old" "$TMPDIR/pkginfo"
     fi
 
     if (( BUILDINFO )); then
-        bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
+        bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/buildinfo-old"
-        bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
+        bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/buildinfo"
-    fi
 
-    if (( TARLIST || PKGINFO || BUILDINFO )); then
+        sdiff -s "$TMPDIR/buildinfo-old" "$TMPDIR/buildinfo"
-    # 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"
+        diffoscope "$oldpkg" "$newpkg"
     fi
 }
 
-shopt -s extglob
-
 fetch_pkg() {
     local pkg pkgdest pkgurl
     case $1 in
@@ -257,24 +165,13 @@ fetch_pkg() {
         *.pkg.tar*)
             pkgurl=$1 ;;
         '')
-        ;;
+            ;;
         *)
             pkg=$1 ;;
     esac
 
-    if [[ -z ${pkgurl} ]]; then
+    [[ -n $pkgurl ]] || pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
-        # Try to find latest package in pool dir
+    die "Couldn't download previous package for %s." "$pkg"
-        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}
@@ -295,14 +192,12 @@ fetch_pkg() {
     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
+    # shellcheck source=PKGBUILD.proto
     . ./PKGBUILD
     if [[ ${arch[0]} == 'any' ]]; then
         CARCH='any'

bin/pkg/export-pkgbuild-keys.in

@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+m4_include(lib/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=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

bin/pkg/find-libdeps.in

@@ -1,13 +1,21 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
-
-# shellcheck source=src/lib/base/message.sh
-source "${LIBDIR}"/base/message.sh
 
 set -e
+shopt -s extglob
 
 IGNORE_INTERNAL=0
 
@@ -43,13 +51,9 @@ 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
@@ -62,8 +66,6 @@ process_sofile() {
     fi
 }
 
-shopt -u extglob
-
 case $script_mode in
     deps) find_args=(-perm -u+x);;
     provides) find_args=(-name '*.so*');;

bin/pkg/finddeps.in

@@ -1,11 +1,18 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
-
-# shellcheck source=src/lib/base/message.sh
-source "${LIBDIR}"/base/message.sh
 
 match=$1
 
@@ -21,7 +28,7 @@ fi
 find . -type d -print0 2>/dev/null| while read -r -d '' d; do
     if [[ -f "$d/PKGBUILD" ]]; then
         pkgname=() depends=() makedepends=() optdepends=()
-        # shellcheck source=contrib/makepkg/PKGBUILD.proto
+        # shellcheck source=PKGBUILD.proto
         . "$d/PKGBUILD"
         for dep in "${depends[@]}"; do
             # lose the version comparator, if any

bin/pkg/gitearepo.in

@@ -0,0 +1,88 @@
+#!/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() {
+    printf "Usage: %s [options]\n" "${0##*/}"
+    printf '    -r <repo>     Repo name\n'
+    printf '    -c            Create git repo\n'
+    printf '    -t            Transfer git repo to landfill org\n'
+    printf '    -h            This help\n'
+    printf '\n'
+    printf '\n'
+    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 ;;
+    esac
+done
+
+shift $(( OPTIND - 1 ))
+
+org=$(get_pkg_org "${repo}")
+
+${create} && create_repo "${repo}" "${org}"
+
+${transfer} && transfer_repo "${repo}" "${org}"

bin/pkg/lddd.in

@@ -1,11 +1,18 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
-
-# shellcheck source=src/lib/base/message.sh
-source "${LIBDIR}"/base/message.sh
 
 ifs=$IFS
 IFS="${IFS}:"

bin/pkg/links-add.in

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

bin/pkg/makerepropkg.in

@@ -6,16 +6,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/util-base.sh)
-DATADIR=${DATADIR:-'@datadir@'}
+m4_include(lib/base/message.sh)
-SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+m4_include(lib/base/chroot.sh)
-
+m4_include(lib/base/chroot.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/pkg/util.sh
-source "${LIBDIR}"/pkg/util.sh
 
 declare -A buildinfo
 declare -a buildenv buildopts installed installpkgs
@@ -91,14 +85,13 @@ get_pkgfile() {
 
 get_makepkg_conf() {
     local fname=${1}
-    local arch="${2}"
+    local makepkg_conf="${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}"
+    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/artools/makepkg.conf > "${makepkg_conf}"
     return 0
 }
 
@@ -124,8 +117,6 @@ usage() {
 __EOF__
 }
 
-orig_args=("$@")
-
 while getopts 'dM:c:l:h' arg; do
     case "$arg" in
         d) diffoscope=1 ;;
@@ -133,18 +124,17 @@ while getopts 'dM:c:l:h' arg; do
         c) cache_dirs+=("$OPTARG") ;;
         l) chroot="$OPTARG" ;;
         h) usage; exit 0 ;;
-        ?|*) usage; exit 1 ;;
+        *|?) usage; exit 1 ;;
     esac
 done
 shift $((OPTIND - 1))
 
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 [[ -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'."
@@ -182,7 +172,7 @@ for f in "${splitpkgs[@]}"; do
 done
 
 if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <(pacman-conf CacheDir)
+	mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi
 
 ORIG_HOME=${HOME}
@@ -222,14 +212,12 @@ 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
-    # shellcheck disable=SC2153
+    get_makepkg_conf "artools-pkg-0.28.2-1-any" "${makepkg_conf}" || exit 1
-    get_makepkg_conf "artools-pkg-0.31.7-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
-    # shellcheck disable=SC2153
+    get_makepkg_conf "artools-pkg-0.28.2-1-any" "${makepkg_conf}" || exit 1
-    get_makepkg_conf "artools-pkg-0.31.7-1-any" "${CARCH}" "${makepkg_conf}" || exit 1
 # all artools-pkg builds
-elif [[ "${BUILDTOOL}" = artools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
+elif [[ "${BUILDTOOL}" = artools-pkg ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
     true
 # fallback to current makepkg.conf
 else
@@ -260,7 +248,7 @@ chroot-run \
     /chrootbuild -C --noconfirm --log --holdver --skipinteg
 ret=$?
 
-if (( ret == 0 )); then
+if (( ${ret} == 0 )); then
     msg2 "built succeeded! built packages can be found in ${namespace}/build/pkgdest"
     msg "comparing artifacts..."
 

bin/pkg/mkchrootpkg.in

@@ -1,16 +1,22 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
+m4_include(lib/base/chroot.sh)
 
-# shellcheck source=src/lib/base/message.sh
+export BUILDTOOL=artools-pkg
-source "${LIBDIR}"/base/message.sh
+export BUILDTOOLVER=m4_artools_pkg_version
-# shellcheck source=src/lib/base/chroot.sh
-source "${LIBDIR}"/base/chroot.sh
-
-export BUILDTOOL=@buildtool@
-export BUILDTOOLVER=@buildtoolver@
 
 shopt -s nullglob
 
@@ -29,9 +35,8 @@ clean_first=0
 run_namcap=0
 run_checkpkg=0
 temp_chroot=0
-tmp_opts="nosuid,nodev,size=50%,nr_inodes=2m"
 
-bindmounts=''
+bindmounts=()
 
 copy=$USER
 [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
@@ -48,7 +53,7 @@ usage() {
     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 "The chroot 'root' directory must be created via the following\n"
     printf 'command:\n'
     printf '    mkchroot <chrootdir>/root base-devel\n'
     printf '\n'
@@ -61,24 +66,26 @@ usage() {
     printf 'Flags:\n'
     printf ' -h         This help\n'
     printf ' -c         Clean the chroot before building\n'
-    printf ' -b <arg>   Bind mount directory/file into build chroot\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 '           This is useful for rebuilds without dirtying the pristine\n'
-    printf '            chroot\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 ' -N         Disable check() function\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
 }
 
 # {{{ functions
+
 # Usage: sync_chroot $chrootdir $copydir [$copy]
 sync_chroot() {
     local chrootdir=$1
@@ -141,7 +148,9 @@ install_packages() {
     pkgnames=("${install_pkgs[@]##*/}")
 
     cp -- "${install_pkgs[@]}" "$copydir/root/"
-    chroot-run -b "${bindmounts}" "$copydir" \
+    chroot-run \
+        -b "${bindmounts[@]}" \
+        "$copydir" \
         bash -c 'yes y | pacman -U -- "$@"' -bash "${pkgnames[@]/#//root/}"
     ret=$?
     rm -- "${pkgnames[@]/#/$copydir/root/}"
@@ -177,7 +186,7 @@ prepare_chroot() {
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
-builduser ALL=(ALL:ALL) NOPASSWD: /usr/bin/pacman
+builduser ALL = NOPASSWD: /usr/bin/pacman
 EOF
     chmod 440 "$copydir/etc/sudoers.d/builduser-pacman"
 
@@ -188,7 +197,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
@@ -205,7 +214,6 @@ _chrootbuild() {
     # No coredumps
     ulimit -c 0
 
-    # shellcheck disable=SC1091
     . /etc/locale.conf
 
     # shellcheck source=/dev/null
@@ -216,8 +224,8 @@ _chrootbuild() {
     # ${1} is OK, but $foo or $1 isn't.
     # https://bugzilla.sudo.ws/show_bug.cgi?id=765
     sudo --preserve-env=SOURCE_DATE_EPOCH \
-        --preserve-env=BUILDTOOL \
+        -preserve-env=BUILDTOOL \
-        --preserve-env=BUILDTOOLVER \
+		--preserve-env=BUILDTOOLVER \
         -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
     ret=$?
     case $ret in
@@ -264,7 +272,6 @@ move_products() {
 
         # Fix broken symlink because of temporary chroot PKGDEST /pkgdest
         if [[ "$PWD" != "$PKGDEST" && -L "$PWD/${pkgfile##*/}" ]]; then
-            # shellcheck disable=SC2226
             ln -sf "$PKGDEST/${pkgfile##*/}"
         fi
     done
@@ -277,7 +284,6 @@ move_products() {
 
         # Fix broken symlink because of temporary chroot SRCPKGDEST /srcpkgdest
         if [[ "$PWD" != "$SRCPKGDEST" && -L "$PWD/${s##*/}" ]]; then
-            # shellcheck disable=SC2226
             ln -sf "$SRCPKGDEST/${s##*/}"
         fi
     done
@@ -289,7 +295,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") ;;
@@ -307,7 +313,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 "${BASH_SOURCE[0]}" "$@"
+check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
 
 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$passeddir")
@@ -323,14 +329,13 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")
 
-# See if -R, -e or -A was passed to makepkg
+# See if -R or -e was passed to makepkg
 for arg in "${@:$OPTIND}"; do
     case ${arg%%=*} in
-        --skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
+        --skip*|--holdver) verifysource_args+=("$arg") ;;
         --repackage|--noextract) keepbuilddir=1 ;;
         --*) ;;
-        -*A*) verifysource_args+=(-A) ;;&
+        -*R*|-*e*) keepbuilddir=1 ;;
-        -*R*|-*e*) keepbuilddir=1 ;;&
     esac
 done
 
@@ -354,8 +359,10 @@ 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
 
@@ -376,8 +383,7 @@ download_sources
 prepare_chroot
 
 if chroot-run \
-    -t "${tmp_opts}" \
+    -b "${bindmounts[*]}" \
-    -b "${bindmounts} -B:${PWD}:/startdir -B:${SRCDEST}:/srcdest" \
     "$copydir" \
     /chrootbuild "${makepkg_args[@]}"
 then
@@ -408,7 +414,6 @@ else
             warning "Skipped checkpkg due to missing repo packages"
             exit 0
         fi
-
         # download package files if any non-local location exists
         for remotepkg in "${remotepkgs[@]}"; do
             if [[ $remotepkg != file://* ]]; then
@@ -420,9 +425,8 @@ else
                 break
             fi
         done
-
         msg2 "Checking packages"
-        sudo -u "$makepkg_user" checkpkg --rmdir --warn --makepkg-config "$copydir/etc/makepkg.conf" "${remotepkgs[@]/#file:\/\//}"
+        sudo -u "$makepkg_user" checkpkg --rmdir --warn "${remotepkgs[@]/#file:\/\//}"
     fi
     true
 fi

bin/pkg/mkdepgraph.in

@@ -1,6 +1,16 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# 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.
 
 mk_tree_graph(){
     printf "%s\n" "$(pactree "${tree_args[@]}" "${package}")" \

bin/pkg/pkg2yaml.in

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

bin/pkg/signpkg.in

@@ -1,15 +1,20 @@
 #!/bin/bash
 #
-# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-LIBDIR=${LIBDIR:-'@libdir@'}
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/deploy.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
-
-# shellcheck source=config/makepkg/x86_64.conf
 load_makepkg_config
 
 passfiles=("$@")
@@ -37,10 +42,5 @@ for pkg in "${passfiles[@]}"; do
         msg2 "Found: %s" "${pkgfile}"
         [[ -e "${pkgfile}".sig ]] && rm "${pkgfile}".sig
         sign_pkg "${pkgfile}"
-        ret=0
-    else
-        ret=1
     fi
 done
-
-exit "$ret"

bin/pkg/tidyarch.in

@@ -0,0 +1,202 @@
+#!/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)
+m4_include(lib/pkg/repo.sh)
+
+git_rm() {
+    local r="$1"
+    if ! "$run_f"; then
+        printf "git rm -r %s\n" "$r"
+        printf "git commit -m 'remove %s'\n" "${r##*/}"
+    else
+        git rm -r  "$r"
+        git commit -m "remove ${r##*/}"
+    fi
+}
+
+compare_ver() {
+    local a="$1" b="$2" tree="$3" func="$4" va vb
+    # shellcheck disable=1090
+    source "$a"/PKGBUILD 2>/dev/null
+    va=$(get_full_version)
+    unset pkgver epoch pkgrel arch
+    # shellcheck disable=1090
+    source "$b"/PKGBUILD 2>/dev/null
+    vb=$(get_full_version)
+    unset pkgver epoch pkgrel arch
+    msg2 "a: %s b: %s" "$va" "$vb"
+    local ret
+    ret=$(vercmp "$va" "$vb")
+    msg2 "ret: %s" "$ret"
+    if [ "$ret" -gt 0 ]; then
+        git_rm "$b"
+    elif [ "$ret" -lt 0 ]; then
+        git_rm "$a"
+    else
+        case "$tree" in
+            "${ARCH_TREE[0]}") git_rm "$a" ;;
+            "${ARCH_TREE[1]}") git_rm "$b" ;;
+        esac
+    fi
+}
+
+check_duplicates() {
+    mapfile -t duplicates < <(find "${TREE_DIR_ARCH}" -mindepth 2 -maxdepth 2 -type d -not -path "*.git" -printf '%f\n' | sort | uniq -d)
+
+    for p in "${duplicates[@]}"; do
+        msg "%s" "$p"
+        local av bv a b
+
+        a="${TREE_DIR_ARCH}/${ARCH_TREE[0]}"
+        # shellcheck disable=1090
+        source "$a/$p"/trunk/PKGBUILD 2>/dev/null
+        av=$(get_full_version)
+
+        b="${TREE_DIR_ARCH}/${ARCH_TREE[1]}"
+        # shellcheck disable=1090
+        source "$b/$p"/trunk/PKGBUILD 2>/dev/null
+        bv=$(get_full_version)
+
+        msg2 "a: %s b: %s" "$av" "$bv"
+        ret=$(vercmp "$av" "$bv")
+        msg2 "ret: %s" "$ret"
+
+        if [ "$ret" -gt 0 ]; then
+            cd "$b"
+            msg2 "%s" "${b##*/}"
+            git_rm "$p"
+        elif [ "$ret" -lt 0 ]; then
+            cd "$a"
+            msg2 "%s" "${a##*/}"
+            git_rm "$p"
+        fi
+    done
+}
+# git config core.mergeoptions --no-edit
+check_tree() {
+    for tree in "${ARCH_TREE[@]}"; do
+        cd "${TREE_DIR_ARCH}/$tree" || exit
+
+        mapfile -t pkgs < <(find . -mindepth 2 -maxdepth 2 -type d -name repos | sort)
+
+        for p in "${pkgs[@]}"; do
+
+            mapfile -t repos < <(find "$p" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort)
+
+            local repos_dir=$p
+            p=${p%/*}
+            p=${p##*/}
+            local size=${#repos[@]}
+
+            if (( "$size" > 1 )); then
+                if [[ "${repos[1]}" != "${valid_names[11]}"-* ]] || [[ "${repos[1]}" != "${valid_names[12]}"-* ]]; then
+
+                    local a="$repos_dir/${repos[0]}" b="$repos_dir/${repos[1]}"
+
+                    # repo mismatches
+                    if [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[1]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[7]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[4]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[0]}"-* ]] && [[ "${repos[1]}" == "${valid_names[1]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[0]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[3]}"-* ]] && [[ "${repos[1]}" == "${valid_names[7]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[3]}"-* ]] && [[ "${repos[1]}" == "${valid_names[4]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+                    fi
+
+                    # same repo name but different arch
+                    if [[ "${repos[0]}" == "${valid_names[0]}"-any ]] && [[ "${repos[1]}" == "${valid_names[0]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[1]}"-any ]] && [[ "${repos[1]}" == "${valid_names[1]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-any ]] && [[ "${repos[1]}" == "${valid_names[2]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+                    fi
+                fi
+            fi
+        done
+    done
+}
+
+usage() {
+    printf 'Usage: %s\n' "${0##*/}"
+    printf '    -f                 Apply filter\n'
+    printf '    -r                 Run removal\n'
+    printf '    -d                 Check for duplicates\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+load_makepkg_config
+
+load_valid_names
+
+filter=false
+dupl=false
+run_f=false
+
+opts='hrfd'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        f) filter=true ;;
+        r) run_f=true ;;
+        d) dupl=true ;;
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+"$filter" && check_tree
+
+"$dupl" && check_duplicates

config/conf/artools-iso.conf

@@ -1,37 +0,0 @@
-#!/hint/bash
-# shellcheck disable=2034
-
-#############################################
-################ artools-iso ################
-#############################################
-
-# default chroots dir where buildiso chroots are created
-# CHROOTS_DIR=/var/lib/artools
-
-# default workspace directory
-# WORKSPACE_DIR="${USER_HOME}/artools-workspace"
-
-# default arch to build
-# ARCH=$(uname -m)
-
-# default pacman.conf to include
-# possible values: {stable,gremlins,goblins}
-# STABILITY="stable"
-
-# default iso storage directory
-# ISO_POOL="${WORKSPACE_DIR}/iso"
-
-# default dist release; default: auto
-# ISO_VERSION=$(date +%Y%m%d)
-
-# default init system, possible values: openrc, runit, s6, suite66, dinit
-# INITSYS="openrc"
-
-# gpg key; leave empty or commented to skip img signing
-# GPG_KEY=""
-
-# default compression, possible values: zstd (default), xz
-# COMPRESSION="zstd"
-
-# default compression level, zstd only: range 1..22
-# COMPRESSION_LEVEL=15

config/conf/artools-pkg.conf

@@ -1,43 +0,0 @@
-#!/hint/bash
-# shellcheck disable=2034
-
-#############################################
-################ artools-pkg ################
-#############################################
-
-# default chroots dir where buildpkg chroots are created
-# CHROOTS_DIR=/var/lib/artools
-
-# default workspace directory
-# WORKSPACE_DIR="${USER_HOME}/artools-workspace"
-
-# default arch to build
-# ARCH=$(uname -m)
-
-# default pacman.conf repos to include
-# possible values: {system,world,galaxy,lib32}{-gremlins,-goblins}
-# REPO="world"
-
-# gitea user access token for gitea api
-# GIT_TOKEN=''
-
-# default workspace dir for artixpkg
-# 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'
-
-# default archiving org
-# GIT_ORG_ARCHIVE='landfill'
-
-# default jenkins agents
-# AGENTS=(orion taurus)
-
-# whether to include custom maintainer line when importing from arch
-# PATCH_MAINTAINER=yes

config/pacman/iso-goblins-x86_64.conf

@@ -1,115 +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
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 10
-
-# 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-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[system-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[world-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-# [lib32-goblins]
-# Include = /etc/pacman.d/mirrorlist
-#
-# [lib32-gremlins]
-# Include = /etc/pacman.d/mirrorlist
-#
-# [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

config/pacman/iso-gremlins-x86_64.conf

@@ -1,103 +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
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 10
-
-# 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-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
-
-[galaxy-gremlins]
-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-gremlins]
-# Include = /etc/pacman.d/mirrorlist
-#
-# [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

config/pacman/iso-x86_64.conf

@@ -1,103 +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
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 10
-
-# 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-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
-
-# [galaxy-gremlins]
-# 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-gremlins]
-# Include = /etc/pacman.d/mirrorlist
-#
-# [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

config/pacman/system-gremlins-x86_64.conf

@@ -1,89 +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.
-
-[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
-
-# 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

config/pacman/system-x86_64.conf

@@ -1,89 +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.
-
-#[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
-
-# 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

config/pacman/world-gremlins-x86_64.conf

@@ -1,89 +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.
-
-[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
-
-# 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

config/pacman/world-x86_64.conf

@@ -1,89 +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.
-
-#[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
-
-# 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

config/setarch-aliases.d/x86_64_v3

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

contrib/completion/bash/artixpkg.in

@@ -1,275 +0,0 @@
-#/usr/bin/env bash
-
-LIBDIR=${LIBDIR:-'@libdir@'}
-
-_artixpkg_pkgbase() {
-    source "${LIBDIR}"/pkg/git/config.sh
-    source "${LIBDIR}"/pkg/util.sh
-    ls -1 "${TREE_DIR_ARTIX}" | tr '\n' ' '
-}
-
-_artixpkg_completion() {
-    local cur prev comps comps_all repos autorepos teams agents cwords comp_cword_exflag
-    source "${LIBDIR}"/pkg/db/db.sh 2>/dev/null
-
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    for ((i = COMP_CWORD - 1; i >= 0; i--)); do
-        if [[ ${COMP_WORDS[i]} != -* ]]; then
-            last_non_flag_word="${COMP_WORDS[i]}"
-            break
-        fi
-    done
-
-    comps=""
-    comps_all=""
-    comp_cword_exflag=0
-    comp_cword_all=0
-    for ((i = 0; i < ${#COMP_WORDS[@]} - 1; i++)); do
-        word="${COMP_WORDS[i]}"
-        comps_all+=" $word"
-        ((comp_cword_all++))
-        if [[ $word != -* ]]; then
-            comps+=" $word"
-            ((comp_cword_exflag++))
-        fi
-    done
-    comps="${comps:1}"
-    comps_all="${comps_all:1}"
-
-    repos=""
-    for word in "${ARTIX_DB[@]}"; do
-        if [[ $word != -* ]]; then
-            repos+=" $word"
-        fi
-    done
-    repos="${repos:1}"
-    autorepos=""
-    for word in "${ARTIX_DB_MAP[@]}"; do
-        if [[ $word != -* ]]; then
-            autorepos+=" $word"
-        fi
-    done
-    autorepos="${autorepos:1}"
-    teams=""
-    for word in "${ARTIX_TEAMS[@]}"; do
-        if [[ $word != -* ]]; then
-            teams+=" $word"
-        fi
-    done
-    teams="${teams:1}"
-    agents=""
-    for word in "${AGENTS[@]}"; do
-        if [[ $word != -* ]]; then
-            agents+=" $word"
-        fi
-    done
-    agents="${agents:1}"
-
-
-    case "${comp_cword_exflag}" in
-        1)
-            COMPREPLY=($(compgen -W "admin git repo version -h --help" -- "${cur}"))
-            return 0
-            ;;
-        2)
-            case ${prev} in
-                admin)
-                    COMPREPLY=($(compgen -W "maintainer query team topic transfer -h --help" -- ${cur}))
-                    ;;
-                git)
-                    COMPREPLY=($(compgen -W "ci clone config create pull push -h --help" -- ${cur}))
-                    ;;
-                repo)
-                    COMPREPLY=($(compgen -W "add remove move import show -h --help" -- ${cur}))
-                    ;;
-                version)
-                    COMPREPLY=($(compgen -W "-h --help" -- ${cur}))
-                    ;;
-            esac
-            ;;  
-        *)
-            case "${comps}" in
-                "artixpkg repo add"*)
-                    local repoAddCommon="-p --push -r --rebuild -n --nocheck -h --help"
-                    case "${comp_cword_exflag}" in
-                        3)
-                            COMPREPLY=($(compgen -W "$repoAddCommon $autorepos $repos" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "$repoAddCommon $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg repo remove"*)
-                    case "${comp_cword_exflag}" in
-                        3)
-                            COMPREPLY=($(compgen -W "-p --push -h --help $autorepos $repos" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-p --push -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg repo move"*)
-                    case "${comp_cword_exflag}" in
-                        3|4)
-                            COMPREPLY=($(compgen -W "-p --push -h --help $autorepos $repos" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-p --push -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg repo import"*)
-                    case "${prev}" in
-                        "--tag")
-                            # this flag expects a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "--del -h --help --tag $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg repo show")
-                    COMPREPLY=($(compgen -W "-b --base -p --pkgs -h --help" -- ${cur}))
-                    ;;
-                "artixpkg git clone"*)
-                    case "${prev}" in
-                        "-a"|"--agent")
-                            COMPREPLY=($(compgen -W "$agents" -- ${cur}))
-                            ;;
-                        "--protocol")
-                            COMPREPLY=($(compgen -W "https" -- ${cur}))
-                            ;;
-                        "-t"|"--team")
-                            COMPREPLY=($(compgen -W "$teams" -- ${cur}))
-                            ;;
-                        "-m"|"--maintainer"|"-s"|"--search"|"-t"|"--team"|"-j"|"--jobs")
-                            # these flags expect a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-m --maintainer --protocol -s --search -t --team -a --agent -j --jobs --all -h --help" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg git config"*)
-                    case "${prev}" in
-                        "--protocol")
-                            COMPREPLY=($(compgen -W "https" -- ${cur}))
-                            ;;
-                        "-j"|"--jobs")
-                            # these flags expect a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "--protocol -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg git create"*)
-                    case "${prev}" in
-                        "-a"|"--agent")
-                            COMPREPLY=($(compgen -W "$agents" -- ${cur}))
-                            ;;
-                        "-t"|"--team")
-                            COMPREPLY=($(compgen -W "$teams" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-c --clone -a --agent -t --team -h --help" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg git pull"*)
-                    case "${prev}" in
-                        "-t"|"--topic"|"-m"|"--maintainer"|"-j"|"--jobs")
-                            # these flags expect a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            case "${comps_all}" in
-                                *--all*)
-                                    COMPREPLY=($(compgen -W "-m --maintainer -t --topic -j --jobs -h --help" -- ${cur}))
-                                    ;;
-                                *)
-                                    COMPREPLY=($(compgen -W "-m --maintainer -t --topic -j --jobs --all -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                                    ;;
-                            esac
-                            ;;
-                    esac
-                    ;;
-                "artixpkg git push"*)
-                    case "${prev}" in
-                        "-m"|"--maintainer"|"-t"|"--topic"|"-j"|"--jobs")
-                            # this flag expects a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-m --maintainer -t --topic -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg git ci"*)
-                    case "${prev}" in
-                        "-a"|"--agent")
-                            COMPREPLY=($(compgen -W "$agents" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-a --agent -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg admin maintainer"*)
-                    case "${comp_cword_all}" in
-                        3)
-                            COMPREPLY=($(compgen -W "-a --adopt --o --orphan -h --help" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg admin query"*)
-                    case "${prev}" in
-                        "-m"|"--maintainer"|"-t"|"--topic")
-                            # this flag expects a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-m --maintainer -t --topic -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg admin team"*)
-                    case "${prev}" in
-                        "-a"|"--add"|"-r"|"--remove")
-                            COMPREPLY=($(compgen -W "$teams" -- ${cur}))
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-a --add -c --check -l --list -r --remove -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg admin topic"*)
-                    case "${prev}" in
-                        "-a"|"--add"|"-r"|"--remove"|"-j"|"--jobs")
-                            # this flag expects a parameter
-                            COMPREPLY=()
-                            ;;
-                        *)
-                            COMPREPLY=($(compgen -W "-a --add -r --remove -d --del -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                            ;;
-                    esac
-                    ;;
-                "artixpkg admin transfer"*)
-                    COMPREPLY=($(compgen -W "-h --help $(_artixpkg_pkgbase)" -- ${cur}))
-                    ;;
-            esac
-            ;;
-    esac
-}
-
-complete -F _artixpkg_completion artixpkg

contrib/iso/profile.conf.example

@@ -1,17 +0,0 @@
-################ install ################
-
-# start services
-# bluetoothd, cupsd, DM are added to the pkglist dynamicly
-# metalog or syslog-ng is added to the pkglist dynamicly
-# connmand or NetworkManager is added to the pkglist dynamicly
-# only added if in array, these pkgs have no list entry
-
-SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'connmand')
-
-################# live-session #################
-
-# default value
-# PASSWORD="artix"
-
-# Set to false to disable autologin in the live session
-AUTOLOGIN="false"

contrib/makepkg/PKGBUILD.proto

@@ -1,48 +0,0 @@
-#!/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-base.conf

@@ -0,0 +1,9 @@
+#############################################
+################ artools-base ###############
+#############################################
+
+# build dir where buildpkg or buildiso chroots are created
+# CHROOTS_DIR=/var/lib/artools
+
+# the workspace directory
+# WORKSPACE_DIR="${USER_HOME}/artools-workspace"

data/conf/artools-iso.conf

@@ -0,0 +1,21 @@
+#############################################
+################ artools-iso ################
+#############################################
+
+# the iso storage directory
+# ISO_POOL="${WORKSPACE_DIR}/iso"
+
+# the dist release; default: auto
+# ISO_VERSION=$(date +%Y%m%d)
+
+# possible values: openrc, runit, s6, suite66, dinit
+# INITSYS="openrc"
+
+# gpg key; leave empty or commented to skip img signing
+# GPG_KEY=""
+
+# possible values: zstd (default), xz
+# COMPRESSION="zstd"
+
+# zstd only: range 1..22
+# COMPRESSION_LEVEL=15

data/conf/artools-pkg.conf

@@ -0,0 +1,31 @@
+#############################################
+################ artools-pkg ################
+#############################################
+
+# gitea user access token for buildtree
+# GIT_TOKEN=''
+
+# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
+
+# customize buildtree
+# ARTIX_TREE=(
+#     main
+#     initsys
+#     desktop
+#     addons
+#     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/makepkg.conf

@@ -25,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -41,19 +41,18 @@ CHOST="x86_64-pc-linux-gnu"
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-         -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS=""
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-DEBUG_RUSTFLAGS="-C debuginfo=2"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT

data/pacman/pacman-default.conf

@@ -70,15 +70,12 @@ 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.
 
-#[system-gremlins]
+#[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
 

data/pacman/pacman-docker.conf

@@ -0,0 +1,99 @@
+#
+# /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-gnome-wobble.conf

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

data/pacman/pacman-goblins.conf

@@ -70,24 +70,27 @@ 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.
 
-[system-goblins]
+[goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[system-gremlins]
+[gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[world-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

data/pacman/pacman-gremlins.conf

@@ -70,15 +70,12 @@ 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.
 
-[system-gremlins]
+[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
 

data/pacman/pacman-kde-wobble.conf

@@ -70,24 +70,30 @@ 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.
 
-[system-goblins]
+[kde-wobble]
 Include = /etc/pacman.d/mirrorlist
 
-[system-gremlins]
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[world-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

data/pacman/pacman-lib32-goblins.conf

@@ -70,24 +70,27 @@ 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.
 
-[system-goblins]
+[goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[system-gremlins]
+[gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[world-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the lib32 repositories as required here.
 

data/pacman/pacman-lib32-gremlins.conf

@@ -70,16 +70,19 @@ 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.
 
-[system-gremlins]
+[gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world-gremlins]
+[world]
 Include = /etc/pacman.d/mirrorlist
 
-[world]
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

data/pacman/pacman-lib32.conf

@@ -70,16 +70,19 @@ 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.
 
-#[system-gremlins]
+#[gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-#[world-gremlins]
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+#[galaxy-gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
-[world]
+[galaxy]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

data/patches/artix-bash.patch

@@ -0,0 +1,87 @@
+--- /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

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

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

lib/base/chroot.sh

@@ -1,23 +1,21 @@
 #!/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
-        exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
+        # shellcheck disable=2154
+        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 ]]
 }

lib/base/common.sh

@@ -0,0 +1,16 @@
+#!/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/base/message.sh

@@ -1,19 +1,17 @@
 #!/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
-source "${MAKEPKG_LIBRARY}"/util.sh
+. /usr/share/makepkg/util.sh
 
 export LANG=C
 
-if [[ -t 2 && "$TERM" != dumb ]] || [[ ${ARTOOLS_COLOR} == always ]]; then
+shopt -s extglob
+
+if [[ -t 2 && "$TERM" != dumb ]]; then
     colorize
 else
     # shellcheck disable=2034
@@ -26,19 +24,14 @@ 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
+	local fd=$1
-    exec {fd}>&-
+	exec {fd}>&-
 }
 
 lock() {
@@ -81,7 +74,7 @@ trap_abort() {
 trap_exit() {
     local r=$?
     trap - EXIT INT QUIT TERM HUP
-    cleanup "$r"
+    cleanup $r
 }
 
 cleanup() {
@@ -101,28 +94,4 @@ 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
-}
-
 #}}}

lib/base/mount.sh

@@ -0,0 +1,84 @@
+#!/hint/bash
+
+#{{{ mount
+
+ignore_error() {
+    "$@" 2>/dev/null
+    return 0
+}
+
+trap_setup(){
+    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
+    trap "$1" EXIT
+}
+
+chroot_mount() {
+#     msg2 "mount: [%s]" "$2"
+    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
+}
+
+chroot_add_resolv_conf() {
+    local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
+
+    [[ -e /etc/resolv.conf ]] || return 0
+
+    # Handle resolv.conf as a symlink to somewhere else.
+    if [[ -L $chrootdir/etc/resolv.conf ]]; then
+        # readlink(1) should always give us *something* since we know at this point
+        # it's a symlink. For simplicity, ignore the case of nested symlinks.
+        resolv_conf=$(readlink "$chrootdir/etc/resolv.conf")
+        if [[ $resolv_conf = /* ]]; then
+            resolv_conf=$chrootdir$resolv_conf
+        else
+            resolv_conf=$chrootdir/etc/$resolv_conf
+        fi
+
+        # ensure file exists to bind mount over
+        if [[ ! -f $resolv_conf ]]; then
+            install -Dm644 /dev/null "$resolv_conf" || return 1
+        fi
+    elif [[ ! -e $chrootdir/etc/resolv.conf ]]; then
+        # The chroot might not have a resolv.conf.
+        return 0
+    fi
+
+    chroot_mount /etc/resolv.conf "$resolv_conf" --bind
+}
+
+chroot_mount_conditional() {
+    local cond=$1; shift
+    if eval "$cond"; then
+        chroot_mount "$@"
+    fi
+}
+
+chroot_setup(){
+    local mnt="$1" os="$2" args='-t tmpfs -o nosuid,nodev,mode=0755'
+    $os && args='--bind'
+    chroot_mount_conditional "! mountpoint -q '$mnt'" "$mnt" "$mnt" --bind &&
+    chroot_mount proc "$mnt/proc" -t proc -o nosuid,noexec,nodev &&
+    chroot_mount sys "$mnt/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
+    ignore_error chroot_mount_conditional "[[ -d '$mnt/sys/firmware/efi/efivars' ]]" \
+        efivarfs "$mnt/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
+    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 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_api_umount() {
+    if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
+#         msg2 "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+        umount "${CHROOT_ACTIVE_MOUNTS[@]}"
+    fi
+    unset CHROOT_ACTIVE_MOUNTS
+}
+
+#}}}

lib/base/yaml.sh

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

lib/iso/calamares.sh

@@ -0,0 +1,55 @@
+#!/hint/bash
+
+#{{{ calamares
+
+write_services_conf(){
+    local key1="$1" val1="$2" key2="$3" val2="$4"
+    local yaml
+    yaml=$(write_yaml_header)
+    yaml+=$(write_yaml_map 0 "$key1" "$val1")
+    yaml+=$(write_yaml_map 0 "$key2" "$val2")
+    yaml+=$(write_yaml_map 0 'services')
+    for svc in "${SERVICES[@]}"; do
+        yaml+=$(write_yaml_seq 2 "$svc")
+    done
+    yaml+=$(write_empty_line)
+    printf '%s\n' "${yaml}"
+}
+
+write_services_openrc_conf(){
+    local conf="$1"/services-openrc.conf
+    write_services_conf 'initdDir' '/etc/init.d' 'runlevelsDir' '/etc/runlevels' > "$conf"
+}
+
+write_services_runit_conf(){
+    local conf="$1"/services-runit.conf
+    write_services_conf 'svDir' '/etc/runit/sv' 'runsvDir' '/etc/runit/runsvdir' > "$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(){
+    local conf="$1"/services-suite66.conf
+    write_services_conf 'svDir' '/etc/66/service' 'runsvDir' '/var/lib/66/system' > "$conf"
+}
+
+write_services_dinit_conf(){
+    local conf="$1"/services-dinit.conf
+    write_services_conf 'initdDir' '/etc/dinit.d' 'runsvDir' '/etc/dinit.d/boot.d' > "$conf"
+}
+
+configure_calamares(){
+    local mods="$1/etc/calamares/modules"
+    if [[ -d "$mods" ]];then
+        msg2 "Configuring: Calamares"
+        write_services_"${INITSYS}"_conf "$mods"
+        sed -e "s|services-openrc|services-${INITSYS}|" \
+            -i "$1"/etc/calamares/settings.conf
+    fi
+}
+
+#}}}

lib/iso/config.sh

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

lib/iso/dracut.sh

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

lib/iso/firmware.sh

@@ -1,6 +1,4 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ firmware
 
@@ -13,6 +11,7 @@ prepare_boot_extras(){
     done
 
     cp "$src"/boot/memtest86+/memtest.bin "$dest"/memtest
+    cp "$src"/usr/share/licenses/common/GPL2/license.txt "$dest"/memtest.COPYING
 }
 
 #}}}

lib/iso/grub.sh

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

lib/iso/initcpio.sh

@@ -0,0 +1,72 @@
+#!/hint/bash
+
+#{{{ initcpio
+
+make_checksum(){
+    local file="$1"
+    msg2 "Creating md5sum ..."
+    cd "${iso_root}${live_dir}"
+    md5sum "$file" > "$file".md5
+    cd "${OLDPWD}"
+}
+
+make_sig () {
+    local file="$1"
+    msg2 "Creating signature file..."
+    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
+    su "${owner}" -c "gpg --detach-sign --output $file.sig --default-key ${GPG_KEY} $file"
+    chown "root:root" "${iso_root}${live_dir}"
+}
+
+export_gpg_publickey() {
+    key_export=${WORKSPACE_DIR}/pubkey.gpg
+    if [[ ! -e "${key_export}" ]]; then
+        gpg --batch --output "${key_export}" --export "${GPG_KEY}"
+    fi
+}
+
+prepare_initramfs_mkinitcpio() {
+    local mnt="$1" packages=() mkinitcpio_conf k
+
+    mkinitcpio_conf=mkinitcpio-default.conf
+    [[ "${profile}" == 'base' ]] && mkinitcpio_conf=mkinitcpio-pxe.conf
+    k=$(<"$mnt"/usr/src/linux/version)
+
+    read_from_list "${common_dir}/Packages-boot"
+    basestrap "${basestrap_args[@]}" "$mnt" "${packages[@]}"
+
+    if [[ -n "${GPG_KEY}" ]]; then
+        exec {ARTIX_GNUPG_FD}<>"${key_export}"
+        export ARTIX_GNUPG_FD
+    fi
+
+    artix-chroot "$mnt" mkinitcpio -k "$k" \
+        -c /etc/"$mkinitcpio_conf" \
+        -g /boot/initramfs.img
+
+    if [[ -n "${GPG_KEY}" ]]; then
+        exec {ARTIX_GNUPG_FD}<&-
+        unset ARTIX_GNUPG_FD
+    fi
+    if [[ -f "${key_export}" ]]; then
+        rm "${key_export}"
+    fi
+    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img
+    prepare_boot_extras "$mnt"
+}
+
+configure_grub_mkinitcpio() {
+    msg "Configuring grub kernel options ..."
+    local ro_opts=()
+    local rw_opts=()
+    local kopts=("label=${iso_label}")
+
+    [[ "${profile}" != 'base' ]] && kopts+=('overlay=livefs')
+
+    sed -e "s|@kopts@|${kopts[*]}|" \
+        -e "s|@ro_opts@|${ro_opts[*]}|" \
+        -e "s|@rw_opts@|${rw_opts[*]}|" \
+        -i "${iso_root}"/boot/grub/kernels.cfg
+}
+
+#}}}

lib/iso/iso.sh

@@ -1,17 +1,15 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ iso
 
 get_disturl(){
-    # shellcheck disable=SC2034
+    # shellcheck disable=1091
     . /usr/lib/os-release
     printf "%s\n" "${HOME_URL}"
 }
 
 get_osname(){
-    # shellcheck disable=SC2034
+    # shellcheck disable=1091
     . /usr/lib/os-release
     printf "%s\n" "${NAME}"
 }

lib/iso/mount.sh

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

lib/iso/profile.sh

@@ -1,6 +1,4 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ profile
 
@@ -26,7 +24,7 @@ load_profile(){
 
     [[ -f $profile_dir/${profile}/profile.conf ]] || return 1
 
-    # shellcheck source=contrib/iso/profile.conf.example
+    # shellcheck disable=1090
     [[ -r "$profile_dir/${profile}"/profile.conf ]] && . "$profile_dir/${profile}"/profile.conf
 
     AUTOLOGIN=${AUTOLOGIN:-true}
@@ -43,15 +41,30 @@ load_profile(){
 read_from_list() {
     local list="$1"
     local _space="s| ||g"
-    #local _clean=':a;N;$!ba;s/\n/ /g'
+    local _clean=':a;N;$!ba;s/\n/ /g'
-    local _clean='/^$/d'
     local _com_rm="s|#.*||g"
+
     local _init="s|@initsys@|${INITSYS}|g"
 
-    mapfile -t pkgs < <(sed "$_com_rm" "$list" \
+    msg2 "Loading Packages: [%s] ..." "${list##*/}"
+    packages+=($(sed "$_com_rm" "$list" \
             | sed "$_space" \
             | sed "$_init" \
-            | sed "$_clean" | sort -u)
+            | sed "$_clean"))
+}
+
+read_from_services() {
+    for svc in "${SERVICES[@]}"; do
+        case "$svc" in
+            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}") ;;
+            bluetoothd) packages+=("bluez-${INITSYS}") ;;
+            syslog-ng|metalog) packages+=("$svc-${INITSYS}") ;;
+        esac
+    done
 }
 
 load_pkgs(){
@@ -59,35 +72,15 @@ load_pkgs(){
     packages=()
 
     if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
-        for l in base apps "${INITSYS}"; do
+        read_from_list "${common_dir}/Packages-base"
-            msg2 "Loading Packages: [%s] ..." "Packages-${l}"
+        read_from_list "${common_dir}/Packages-apps"
-            read_from_list "${common_dir}/Packages-${l}"
+        read_from_list "${common_dir}/Packages-${INITSYS}"
-            packages+=("${pkgs[@]}")
+        [[ -n "${live_list}" ]] && read_from_list "${common_dir}/Packages-xorg"
-
+        read_from_list "$pkglist"
-        done
+        read_from_services
-
+    else
-        if [[ -n "${live_list}" ]]; then
+        read_from_list "$pkglist"
-            msg2 "Loading Packages: [Packages-xorg] ..."
-            read_from_list "${common_dir}/Packages-xorg"
-            packages+=("${pkgs[@]}")
-        fi
-
-        for svc in "${SERVICES[@]}"; do
-            case "$svc" in
-                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}") ;;
-                bluetoothd) packages+=("bluez-${INITSYS}") ;;
-                syslog-ng|metalog) packages+=("$svc-${INITSYS}") ;;
-            esac
-        done
-
     fi
-    msg2 "Loading Packages: [%s] ..." "${pkglist##*/}"
-    read_from_list "${pkglist}"
-    packages+=("${pkgs[@]}")
 }
 
 #}}}

lib/iso/services.sh

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

lib/iso/squash.sh

@@ -1,27 +1,7 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ squash
 
-make_checksum(){
-    local file="$1"
-    msg2 "Creating md5sum ..."
-    cd "${iso_root}${live_dir}"
-    md5sum "$file" > "$file".md5
-    cd "${OLDPWD}"
-}
-
-make_sig () {
-    local file="$1"
-    msg2 "Creating signature file..."
-
-    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
-    su "${owner}" -c "gpg --batch --no-armor --no-include-key-block --output $file.sig  --detach-sign \
-        --default-key ${GPG_KEY} ${gpg_options[@]} $file"
-    chown "root:root" "${iso_root}${live_dir}"
-}
-
 make_ext_img(){
     local src="$1"
     local size=32G

lib/iso/trap.sh

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

lib/pkg/common.sh

@@ -0,0 +1,37 @@
+#!/hint/bash
+
+#{{{ common functions
+
+get_compliant_name(){
+    local gitname="$1"
+    case "$gitname" in
+        *+) gitname=${gitname//+/plus} ;;
+        *+*) gitname=${gitname//+/-} ;;
+    esac
+    printf "%s\n" "$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
+    printf "%s\n" "$org"
+}
+
+api_put() {
+    curl -s -X PUT "$@"
+}
+
+api_delete() {
+    curl -s -X DELETE "$@"
+}
+
+api_post() {
+    curl -s -X POST "$@"
+}
+
+#}}}

lib/pkg/deploy.sh

@@ -1,11 +1,7 @@
 #!/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"
@@ -29,6 +25,13 @@ 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%-*}
+    printf "%s\n" "$rm_pkg"
+}
 
 #}}}

lib/pkg/diff.sh

@@ -1,6 +1,4 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ functions
 
@@ -14,21 +12,15 @@ pkgver_equal() {
     fi
 }
 
-shopt -s extglob
-
 find_cached_package() {
-    local searchdirs=("$PWD" "$PKGDEST") results=()
+    local searchdirs=("$PKGDEST" "$PWD") results=()
     local targetname=$1 targetver=$2 targetarch=$3
-    local dir pkg packages pkgbasename name ver rel arch r results
+    local dir pkg pkgbasename name ver rel arch r results
 
     for dir in "${searchdirs[@]}"; do
         [[ -d $dir ]] || continue
 
-        shopt -s extglob nullglob
+        for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
-        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
@@ -72,6 +64,4 @@ find_cached_package() {
     esac
 }
 
-shopt -u extglob
-
 #}}}

lib/pkg/git.sh

@@ -0,0 +1,32 @@
+#!/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" lh="$2" rh
+    rh=$(get_remote_head)
+    if has_changeset "${lh}" "${rh}";then
+        git pull origin master
+    fi
+}
+
+#}}}

lib/pkg/gitea.sh

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

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

lib/pkg/repo.sh

@@ -0,0 +1,51 @@
+#!/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="$r-$pkgarch"
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo="$r"-any
+        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$r"
+    done
+    printf "%s\n" "$repo"
+}
+
+find_pkg(){
+    local searchdir="$1" pkg="$2" result
+    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    printf "%s\n" "$result"
+}
+
+tree_loop(){
+    local func="$1" pkgs
+    for tree in "${ARTIX_TREE[@]}"; do
+        mapfile -t pkgs < <(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
+        for p in "${pkgs[@]}"; do
+            "$func" "$p"
+        done
+    done
+}
+
+#}}}

lib/pkg/table.sh

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

lib/util-base.sh

@@ -0,0 +1,41 @@
+#!/hint/bash
+
+#{{{ base conf
+
+DATADIR=${DATADIR:-'@datadir@/artools'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+if [[ -n $SUDO_USER ]]; then
+    eval "USER_HOME=~$SUDO_USER"
+else
+    USER_HOME=$HOME
+fi
+
+USER_CONF_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"
+
+prepare_dir(){
+    [[ ! -d $1 ]] && mkdir -p "$1"
+}
+
+load_base_config(){
+
+    local conf="$1/artools-base.conf"
+
+    [[ -f "$conf" ]] || return 1
+
+    # shellcheck source=/etc/artools/artools-base.conf
+    [[ -r "$conf" ]] && . "$conf"
+
+    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
+
+    WORKSPACE_DIR=${WORKSPACE_DIR:-"${USER_HOME}/artools-workspace"}
+
+    return 0
+}
+
+#}}}
+
+load_base_config "${USER_CONF_DIR}" || load_base_config "${SYSCONFDIR}"
+
+prepare_dir "${WORKSPACE_DIR}"
+prepare_dir "${USER_CONF_DIR}"

lib/util-iso.sh

@@ -1,40 +1,15 @@
 #!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ iso conf
 
-prepare_dir(){
-    [[ ! -d $1 ]] && mkdir -p "$1"
-    return 0
-}
-
-if [[ -n $SUDO_USER ]]; then
-    eval "USER_HOME=~$SUDO_USER"
-else
-    USER_HOME=$HOME
-fi
-
-USER_CONF_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/artools"
-
-prepare_dir "${USER_CONF_DIR}"
-
 load_iso_config(){
 
     local conf="$1/artools-iso.conf"
 
     [[ -f "$conf" ]] || return 1
 
-    # shellcheck source=config/conf/artools-iso.conf
+    # shellcheck source=/etc/artools/artools-iso.conf
-    [[ -r "$conf" ]] && source "$conf"
+    [[ -r "$conf" ]] && . "$conf"
-
-    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
-
-    WORKSPACE_DIR=${WORKSPACE_DIR:-"${USER_HOME}/artools-workspace"}
-
-    ARCH=${ARCH:-"$(uname -m)"}
-
-    STABILITY=${STABILITY:-'stable'}
 
     ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
 

lib/util-pkg.sh

@@ -0,0 +1,49 @@
+#!/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"}
+
+    [[ -z ${ARTIX_TREE[*]} ]] && \
+    ARTIX_TREE=(main initsys desktop addons lib32)
+
+    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

@@ -1,88 +0,0 @@
-#!/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/mount.sh
-source "${LIBDIR}"/base/mount.sh
-# shellcheck source=src/lib/base/unshare-mount.sh
-source "${LIBDIR}"/base/unshare-mount.sh
-# shellcheck source=src/lib/base/chroot.sh
-source "${LIBDIR}"/base/chroot.sh
-
-
-artix-chroot() {
-    check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
-#     (( EUID == 0 )) || die 'This script must be run with root privileges'
-
-    [[ -d $chrootdir ]] || die "Can't create chroot on non-directory %s" "$chrootdir"
-
-    "$setup" "$chrootdir" || die "failed to setup chroot %s" "$chrootdir"
-    if (( ! keepresolvconf )); then
-        chroot_add_resolv_conf "$chrootdir" || die "failed to setup resolv.conf"
-    fi
-
-    if ! mountpoint -q "$chrootdir"; then
-        warning "$chrootdir is not a mountpoint. This may have undesirable side effects."
-    fi
-
-    chroot_args=()
-    [[ $userspec ]] && chroot_args+=(--userspec "$userspec")
-
-    SHELL=/bin/bash $pid_unshare chroot "${chroot_args[@]}" -- "$chrootdir" "${args[@]}"
-}
-
-usage() {
-    cat <<EOF
-usage: ${0##*/} chroot-dir [command] [arguments...]
-
-    -h                  Print this help message
-    -N                  Run in unshare mode as a regular user
-    -u <user>[:group]   Specify non-root user and optional group to use
-    -r                  Do not change the resolv.conf within the chroot
-
-If 'command' is unspecified, ${0##*/} will launch /bin/bash.
-
-Note that when using artix-chroot, the target chroot directory *should* be a
-mountpoint. This ensures that tools such as pacman(8) or findmnt(8) have an
-accurate hierarchy of the mounted filesystems within the chroot.
-
-If your chroot target is not a mountpoint, you can bind mount the directory on
-itself to make it a mountpoint, i.e. 'mount --bind /your/chroot /your/chroot'.
-
-EOF
-}
-
-orig_args=("$@")
-
-opts=':hNu:r'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        h) usage; exit 0 ;;
-        N) unshare=1 ;;
-        u) userspec=$OPTARG ;;
-        r) keepresolvconf=1 ;;
-        :) die '%s: option requires an argument -- '\''%s'\' "${0##*/}" "$OPTARG" ;;
-        ?) die '%s: invalid option -- '\''%s'\' "${0##*/}" "$OPTARG" ;;
-    esac
-done
-
-(( $# )) || die 'No chroot directory specified'
-
-chrootdir="$1"
-shift
-
-args=("$@")
-if (( unshare )); then
-    setup=unshare_setup
-    "$mount_unshare" bash -c "$(declare_all); artix-chroot"
-else
-    setup=chroot_setup
-    artix-chroot
-fi

src/base/basestrap.in

@@ -1,149 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#
-# Assumptions:
-#  1) User has partitioned, formatted, and mounted partitions on /mnt
-#  2) Network is functional
-#  3) Arguments passed to the script are valid pacman targets
-#  4) A valid mirror appears in /etc/pacman.d/mirrorlist
-#
-
-shopt -s extglob
-
-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/unshare-mount.sh
-source "${LIBDIR}"/base/unshare-mount.sh
-# shellcheck source=src/lib/base/chroot.sh
-source "${LIBDIR}"/base/chroot.sh
-
-
-#{{{ functions
-
-basestrap() {
-    check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
-#     (( EUID == 0 )) || die 'This script must be run with root privileges'
-
-    # create obligatory directories
-    msg "Creating install root at %s" "$newroot"
-    install -d -m755 "$newroot"/var/{cache/pacman/pkg,lib/pacman,log}
-    install -d -m755 "$newroot"/{dev,run,etc/pacman.d}
-    install -d -m1777 "$newroot"/tmp
-    install -d -m555 "$newroot"/{sys,proc}
-
-    # mount API filesystems
-    "$setup" "$newroot" || die "failed to setup chroot %s" "$newroot"
-
-    if [[ ! -d $newroot/etc/pacman.d/gnupg ]]; then
-        if (( initkeyring )); then
-            pacman-key --gpgdir "$newroot"/etc/pacman.d/gnupg --init
-        elif (( copykeyring )) && [[ -d /etc/pacman.d/gnupg ]]; then
-            # if there's a keyring on the host, copy it into the new root
-            cp -a --no-preserve=ownership /etc/pacman.d/gnupg "$newroot/etc/pacman.d/"
-        fi
-    fi
-
-    msg 'Installing packages to %s' "$newroot"
-    if ! $pid_unshare pacman -r "$newroot" "${pacman_args[@]}"; then
-        die 'Failed to install packages to new root'
-    fi
-
-    if (( copymirrorlist )); then
-        # install the host's mirrorlist onto the new root
-        cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
-    fi
-
-    if (( copyconf )); then
-        cp -a "$pacman_config" "$newroot/etc/pacman.conf"
-    fi
-}
-
-#}}}
-
-newroot=/mnt
-
-hostcache=0
-copykeyring=1
-initkeyring=0
-copymirrorlist=1
-pacmode=-Sy
-pacman_args=()
-unshare=0
-copyconf=0
-pacman_config=/etc/pacman.conf
-
-usage() {
-  cat <<EOF
-usage: ${0##*/} [options] root [packages...]
-
-  Options:
-    -C <config>    Use an alternate config file for pacman
-    -c             Use the package cache on the host, rather than the target
-    -D             Skip pacman dependency checks
-    -G             Avoid copying the host's pacman keyring to the target
-    -i             Prompt for package confirmation when needed (run interactively)
-    -K             Initialize an empty pacman keyring in the target (implies '-G')
-    -M             Avoid copying the host's mirrorlist to the target
-    -N             Run in unshare mode as a regular user
-    -P             Copy the host's pacman config to the target
-    -U             Use pacman -U to install packages
-
-    -h             Print this help message
-
-basestrap installs packages to the specified new root directory. If no packages
-are given, basestrap defaults to the "base" group.
-
-EOF
-}
-
-orig_args=("$@")
-
-opts=':C:cDGiKMNPU'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        C) pacman_config=$OPTARG ;;
-        D) pacman_args+=(-dd) ;;
-        c) hostcache=1 ;;
-        i) interactive=1 ;;
-        G) copykeyring=0 ;;
-        K) initkeyring=1 ;;
-        M) copymirrorlist=0 ;;
-        N) unshare=1 ;;
-        P) copyconf=1 ;;
-        U) pacmode=-U ;;
-        :) die '%s: option requires an argument -- '\''%s'\' "${0##*/}" "$OPTARG" ;;
-        ?) die '%s: invalid option -- '\''%s'\' "${0##*/}" "$OPTARG" ;;
-    esac
-done
-shift $(( OPTIND - 1 ))
-
-
-(( $# )) || die "No root directory specified"
-newroot=$1; shift
-
-[[ -d $newroot ]] || die "%s is not a directory" "$newroot"
-
-pacman_args+=("$pacmode" "${@:-base}" --config="$pacman_config")
-
-if (( ! hostcache )); then
-  pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
-fi
-
-if (( ! interactive )); then
-  pacman_args+=(--noconfirm)
-fi
-
-if (( unshare )); then
-    setup=unshare_setup
-    "$mount_unshare" bash -c "$(declare_all); basestrap"
-else
-    setup=chroot_setup
-    basestrap
-fi

src/lib/base/mount.sh

@@ -1,88 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#{{{ mount
-
-ignore_error() {
-    "$@" 2>/dev/null
-    return 0
-}
-
-chroot_add_mount() {
-#     msg2 "mount: [%s]" "$2"
-    mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
-}
-
-chroot_maybe_add_mount() {
-    local cond=$1; shift
-    if eval "$cond"; then
-        chroot_add_mount "$@"
-    fi
-}
-
-chroot_setup(){
-    local mnt="$1"
-    local tmpfs_opts="${2:-mode=1777,strictatime,nodev,nosuid}"
-
-    CHROOT_ACTIVE_MOUNTS=()
-    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
-    trap 'chroot_teardown' EXIT
-
-    #chroot_maybe_add_mount "! mountpoint -q '$mnt'" "$mnt" "$mnt" --bind &&
-    chroot_add_mount proc "$mnt/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_add_mount sys "$mnt/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
-    ignore_error chroot_maybe_add_mount "[[ -d '$mnt/sys/firmware/efi/efivars' ]]" \
-        efivarfs "$mnt/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
-    chroot_add_mount udev "$mnt/dev" -t devtmpfs -o mode=0755,nosuid &&
-    chroot_add_mount devpts "$mnt/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
-    chroot_add_mount shm "$mnt/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
-    chroot_add_mount /run "$mnt/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_add_mount tmp "$mnt/tmp" -t tmpfs -o "${tmpfs_opts}"
-}
-
-chroot_teardown() {
-    if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
-#         msg2 "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-        umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    fi
-    unset CHROOT_ACTIVE_MOUNTS
-}
-
-resolve_link() {
-    local target=$1
-    local root=$2
-
-    # If a root was given, make sure it ends in a slash.
-    [[ -n $root && $root != */ ]] && root=$root/
-
-    while [[ -L $target ]]; do
-        target=$(readlink -m "$target")
-        # If a root was given, make sure the target is under it.
-        # Make sure to strip any leading slash from target first.
-        [[ -n $root && $target != $root* ]] && target=$root${target#/}
-    done
-
-    printf %s "$target"
-}
-
-chroot_add_resolv_conf() {
-    local chrootdir=$1
-    local src
-    local dest="$chrootdir/etc/resolv.conf"
-
-    src=$(resolve_link /etc/resolv.conf)
-
-    # If we don't have a source resolv.conf file, there's nothing useful we can do.
-    [[ -e $src ]] || return 0
-
-    if [[ ! -e "$dest" && ! -h "$dest" ]]; then
-            # There may be no resolv.conf in the chroot. In this case, we'll just exit.
-            # The chroot environment must not be concerned with DNS resolution.
-            return 0
-    fi
-
-    chroot_add_mount "$src" "$dest" -c --bind
-}
-
-#}}}

src/lib/base/unshare-mount.sh

@@ -1,78 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#{{{ mount
-
-chroot_add_mount_lazy() {
-    mount "$@" && CHROOT_ACTIVE_LAZY=("$2" "${CHROOT_ACTIVE_LAZY[@]}")
-}
-
-chroot_bind_device() {
-    touch "$2" && CHROOT_ACTIVE_FILES=("$2" "${CHROOT_ACTIVE_FILES[@]}")
-    chroot_add_mount "$1" "$2" --bind
-}
-
-chroot_add_link() {
-    ln -sf "$1" "$2" && CHROOT_ACTIVE_FILES=("$2" "${CHROOT_ACTIVE_FILES[@]}")
-}
-
-unshare_setup() {
-    CHROOT_ACTIVE_MOUNTS=()
-    CHROOT_ACTIVE_LAZY=()
-    CHROOT_ACTIVE_FILES=()
-    [[ $(trap -p EXIT) ]] && die '(BUG): attempting to overwrite existing EXIT trap'
-    trap 'unshare_teardown' EXIT
-
-    chroot_add_mount_lazy "$1" "$1" --bind &&
-    chroot_add_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
-    chroot_add_mount_lazy /sys "$1/sys" --rbind &&
-    chroot_add_link /proc/self/fd "$1/dev/fd" &&
-    chroot_add_link /proc/self/fd/0 "$1/dev/stdin" &&
-    chroot_add_link /proc/self/fd/1 "$1/dev/stdout" &&
-    chroot_add_link /proc/self/fd/2 "$1/dev/stderr" &&
-    chroot_bind_device /dev/full "$1/dev/full" &&
-    chroot_bind_device /dev/null "$1/dev/null" &&
-    chroot_bind_device /dev/random "$1/dev/random" &&
-    chroot_bind_device /dev/tty "$1/dev/tty" &&
-    chroot_bind_device /dev/urandom "$1/dev/urandom" &&
-    chroot_bind_device /dev/zero "$1/dev/zero" &&
-    chroot_add_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
-    chroot_add_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
-}
-
-unshare_teardown() {
-    chroot_teardown
-
-    if (( ${#CHROOT_ACTIVE_LAZY[@]} )); then
-        umount --lazy "${CHROOT_ACTIVE_LAZY[@]}"
-    fi
-    unset CHROOT_ACTIVE_LAZY
-
-    if (( ${#CHROOT_ACTIVE_FILES[@]} )); then
-        rm "${CHROOT_ACTIVE_FILES[@]}"
-    fi
-    unset CHROOT_ACTIVE_FILES
-}
-
-pid_unshare="unshare --fork --pid"
-mount_unshare="$pid_unshare --mount --map-auto --map-root-user --setuid 0 --setgid 0"
-
-# This outputs code for declaring all variables to stdout. For example, if
-# FOO=BAR, then running
-#     declare -p FOO
-# will result in the output
-#     declare -- FOO="bar"
-# This function may be used to re-declare all currently used variables and
-# functions in a new shell.
-declare_all() {
-  # Remove read-only variables to avoid warnings. Unfortunately, declare +r -p
-  # doesn't work like it looks like it should (declaring only read-write
-  # variables). However, declare -rp will print out read-only variables, which
-  # we can then use to remove those definitions.
-  declare -p | grep -Fvf <(declare -rp)
-  # Then declare functions
-  declare -pf
-}
-
-#}}}

src/lib/iso/calamares.sh

@@ -1,38 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#{{{ calamares
-
-yaml_array() {
-    local array yaml
-
-    for entry in "$@"; do
-        yaml="{name: ${entry}, action: enable}"
-        array="${array:-}${array:+,} ${yaml}"
-    done
-    printf "%s\n" "[${array}]"
-}
-
-configure_calamares(){
-    for config in online offline; do
-        local mods="$1/etc/calamares-$config/modules"
-        if [[ -d "$mods" ]];then
-            msg2 "Configuring: Calamares %s" "$config"
-
-            if [[ -f "$mods"/services-artix.conf ]]; then
-                local svc
-                svc=$(yaml_array "${SERVICES[@]}") \
-                    yq -P 'with(.;
-                            .command = "artix-service" |
-                            .services = env(svc) )' \
-                        -i "$mods"/services-artix.conf
-            fi
-        fi
-    done
-    if [[ -d "$1"/etc/calamares-offline ]]; then
-        ln -sf calamares-offline "$1"/etc/calamares
-    fi
-}
-
-#}}}

src/lib/iso/initcpio.sh

@@ -1,46 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#{{{ initcpio
-
-prepare_initramfs_mkinitcpio() {
-    local mnt="$1" mkinitcpio_conf k
-
-    mkinitcpio_conf=mkinitcpio-default.conf
-    [[ "${profile}" == 'base' ]] && mkinitcpio_conf=mkinitcpio-pxe.conf
-    k=$(<"$mnt"/usr/src/linux/version)
-
-    if [[ -v key_export ]]; then
-        exec {ARTIX_GNUPG_FD}<"${key_export}"
-        export ARTIX_GNUPG_FD
-    fi
-
-    artix-chroot "$mnt" mkinitcpio -k "$k" \
-        -c /etc/"$mkinitcpio_conf" \
-        -g /boot/initramfs.img
-
-    if [[ -v key_export ]]; then
-        exec {ARTIX_GNUPG_FD}<&-
-        unset ARTIX_GNUPG_FD
-    fi
-    rm -rf -- "${key_export}"
-    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img
-    prepare_boot_extras "$mnt"
-}
-
-configure_grub_mkinitcpio() {
-    msg "Configuring grub kernel options ..."
-    local ro_opts=()
-    local rw_opts=()
-    local kopts=("label=${iso_label}")
-
-    [[ "${profile}" != 'base' ]] && kopts+=('overlay=livefs')
-
-    sed -e "s|@kopts@|${kopts[*]}|" \
-        -e "s|@ro_opts@|${ro_opts[*]}|" \
-        -e "s|@rw_opts@|${rw_opts[*]}|" \
-        -i "${iso_root}"/boot/grub/kernels.cfg
-}
-
-#}}}

src/lib/pkg/admin.sh

@@ -1,100 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_ADMIN_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_ADMIN_SH=1
-
-# shellcheck source=src/lib/pkg/db/db.sh
-source "${LIBDIR}"/pkg/db/db.sh
-
-
-set -e
-
-artixpkg_admin_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-    COMMANDS
-        maintainer        Manage repo maintainer
-        query             Query maintainers and topics
-        team              Manage repo team
-        topic             Manage topics
-        transfer          Transfer obsolete repository to landfill
-
-    OPTIONS
-        -h, --help     Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} transfer libfoo libbar
-        $ ${COMMAND} query --topic mytopic
-        $ ${COMMAND} topic --add mytopic libfoo
-        $ ${COMMAND} team --add ${ARTIX_TEAMS[3]} libfoo
-        $ ${COMMAND} maintainer --adopt 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
-        ;;
-
-        query)
-            _ARTOOLS_COMMAND+=" $1"
-            shift
-            # shellcheck source=src/lib/pkg/admin/query.sh
-            source "${LIBDIR}"/pkg/admin/query.sh
-            artixpkg_admin_query "$@"
-            exit 0
-        ;;
-        team)
-            _ARTOOLS_COMMAND+=" $1"
-            shift
-            # shellcheck source=src/lib/pkg/admin/team.sh
-            source "${LIBDIR}"/pkg/admin/team.sh
-            artixpkg_admin_team "$@"
-            exit 0
-        ;;
-        topic)
-            _ARTOOLS_COMMAND+=" $1"
-            shift
-            # shellcheck source=src/lib/pkg/admin/query.sh
-            source "${LIBDIR}"/pkg/admin/topic.sh
-            artixpkg_admin_topic "$@"
-            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
-        ;;
-        maintainer)
-            _ARTOOLS_COMMAND+=" $1"
-            shift
-            # shellcheck source=src/lib/pkg/admin/maintainer.sh
-            source "${LIBDIR}"/pkg/admin/maintainer.sh
-            artixpkg_admin_maintainer "$@"
-            exit 0
-        ;;
-        -*)
-            die "invalid argument: %s" "$1"
-        ;;
-        *)
-            die "invalid command: %s" "$1"
-        ;;
-        esac
-    done
-}

src/lib/pkg/admin/maintainer.sh

@@ -1,137 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_ADMIN_MAINTAINER_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_ADMIN_MAINTAINER_SH=1
-
-# shellcheck source=src/lib/pkg/packager.sh
-source "${LIBDIR}"/pkg/packager.sh
-
-set -e
-
-
-artixpkg_admin_maintainer_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-    OPTIONS
-        -a, --adopt            Adopt repo
-        -o, --orphan           Orphan repo
-        -h, --help             Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} --adopt libfoo
-        $ ${COMMAND} --orphan libfoo libbar
-_EOF_
-}
-
-
-
-artixpkg_admin_maintainer() {
-    if (( $# < 1 )); then
-        artixpkg_admin_maintainer_usage
-        exit 0
-    fi
-
-    # options
-    local pkgbases=()
-    local pkgbase
-
-    local ADOPT=0
-    local ORPHAN=0
-
-    local packager_name
-    local maintainer
-
-    local -r orphan="orphan"
-
-
-    local RUNCMD=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-
-    while (( $# )); do
-        case $1 in
-            -h|--help)
-                artixpkg_admin_maintainer_usage
-                exit 0
-            ;;
-            -a|--adopt)
-                ADOPT=1
-                RUNCMD+=" $1"
-                shift
-            ;;
-            -o|--orphan)
-                ORPHAN=1
-                RUNCMD+=" $1"
-                shift
-            ;;
-            --)
-                shift
-                break
-            ;;
-            -*)
-                die "invalid argument: %s" "$1"
-            ;;
-            *)
-                break
-            ;;
-        esac
-    done
-
-    pkgbases+=("$@")
-
-    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
-    fi
-
-    maintainer="maintainer-${packager_name}"
-
-    if [[ -n ${GIT_TOKEN} ]]; then
-
-        # 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}" "${RUNCMD}" ::: "${pkgbases[@]}"; then
-                die 'Failed to manange some packages, please check the output'
-                exit 1
-            fi
-            exit 0
-        fi
-
-        for pkgbase in "${pkgbases[@]}"; do
-            local gitname
-            gitname=$(get_compliant_name "${pkgbase}")
-
-            if (( ADOPT )); then
-                if ! add_topic "${gitname}" "$maintainer"; then
-                    warning "failed to add topic: $maintainer"
-                fi
-                if ! remove_topic "${gitname}" "$orphan"; then
-                    warning "failed to remove topic: $orphan"
-                fi
-            fi
-
-            if (( ORPHAN )); then
-                if ! add_topic "${gitname}" "$orphan"; then
-                    warning "failed to add topic: $orphan"
-                fi
-                if ! remove_topic "${gitname}" "$maintainer"; then
-                    warning "failed to remove topic: $maintainer"
-                fi
-            fi
-
-        done
-
-    fi
-}

src/lib/pkg/admin/query.sh

@@ -1,81 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_ADMIN_QUERY_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_ADMIN_QUERY_SH=1
-
-set -e
-
-
-artixpkg_admin_query_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-    OPTIONS
-        -m, --maintainer NAME      Query for packages of the named maintainer
-        -t, --topic NAME           Query for packages of the named topic
-        -h, --help                 Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} --maintainer tux
-        $ ${COMMAND} --topic mytopic
-_EOF_
-}
-
-
-
-artixpkg_admin_query() {
-    if (( $# < 1 )); then
-        artixpkg_admin_query_usage
-        exit 0
-    fi
-
-    # options
-    local MAINTAINER=
-    local TOPIC=
-
-    while (( $# )); do
-        case $1 in
-            -h|--help)
-                artixpkg_admin_query_usage
-                exit 0
-            ;;
-            -m|--maintainer)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                MAINTAINER="$2"
-                shift 2
-            ;;
-            -t|--topic)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                TOPIC="$2"
-                shift 2
-            ;;
-            --)
-                shift
-                break
-            ;;
-            -*)
-                die "invalid argument: %s" "$1"
-            ;;
-            *)
-                break
-            ;;
-        esac
-    done
-
-    # Query packages of a maintainer
-    if [[ -n ${MAINTAINER} ]]; then
-        local maint
-        maint="maintainer-${MAINTAINER}"
-        mapfile -t pkgbases < <(search_topic "${maint}" | yq -r '.data | .[].name' | sort)
-        printf "%s\n" "${pkgbases[@]}"
-    fi
-
-    if [[ -n ${TOPIC} ]]; then
-        mapfile -t pkgbases < <(search_topic "${TOPIC}" | yq -P -r '.data | .[].name' | sort)
-        printf "%s\n" "${pkgbases[@]}"
-    fi
-
-}

src/lib/pkg/admin/team.sh

@@ -1,154 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_ADMIN_TEAM_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_ADMIN_TEAM_SH=1
-
-set -e
-
-
-artixpkg_admin_team_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-    OPTIONS
-        -c, --check                 Check if team is assigned
-        -l, --list                  List repo teams
-        -a, --add NAME              Add team to repo
-                                    Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
-        -r, --remove NAME           Remove team from repo
-                                    Possible values: $(yaml_array ${ARTIX_TEAMS[@]})
-        -h, --help                  Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} --check libfoo
-        $ ${COMMAND} --list libfoo
-        $ ${COMMAND} --add ${ARTIX_TEAMS[1]} libfoo
-        $ ${COMMAND} --remove ${ARTIX_TEAMS[3]} libfoo
-_EOF_
-}
-
-
-
-artixpkg_admin_team() {
-    if (( $# < 1 )); then
-        artixpkg_admin_team_usage
-        exit 0
-    fi
-
-    # options
-    local CHECK=0
-    local LIST=0
-    local TEAM_ADD
-    local TEAM_RM
-    local pkgbases=()
-    local pkgbase
-
-    while (( $# )); do
-        case $1 in
-            -h|--help)
-                artixpkg_admin_team_usage
-                exit 0
-            ;;
-            -a|--add)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                TEAM_ADD="$2"
-                shift 2
-            ;;
-            -r|--remove)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                TEAM_RM="$2"
-                shift 2
-            ;;
-            -c|--check)
-                CHECK=1
-                shift
-            ;;
-            -l|--list)
-                LIST=1
-                shift
-            ;;
-            --)
-                shift
-                break
-            ;;
-            -*)
-                die "invalid argument: %s" "$1"
-            ;;
-            *)
-                break
-            ;;
-        esac
-    done
-
-    pkgbases+=("$@")
-
-    if [[ -n ${GIT_TOKEN} ]]; then
-
-        for pkgbase in "${pkgbases[@]}"; do
-
-            if [[ -d "${pkgbase}" ]];then
-
-                if [[ ! -d "${pkgbase}/.git" ]]; then
-                    error "Not a Git repository: ${pkgbase}"
-                    continue
-                fi
-                ( cd "${pkgbase}" || return
-
-                    local gitname
-                    gitname=$(get_compliant_name "${pkgbase}")
-
-                    if (( CHECK )); then
-                        local team
-                        team=$(team_from_yaml)
-                        res=$(check_repo_team  "${gitname}" "${team}" | yq -rP '.name')
-                        if [[ "$res" == "null" ]]; then
-                            error "[%s] does not have team (%s) assigned" "$pkgbase" "${team}"
-                        else
-                            msg "[%s] has team (%s) assigned" "$pkgbase" "${team}"
-                        fi
-                    fi
-
-                    if (( LIST )); then
-                        list_repo_teams "${gitname}" | yq -rP '.[] | .name'
-                    fi
-
-                    if [[ -n ${TEAM_ADD} ]]; then
-
-                        if ! add_team_to_repo "${gitname}" "${TEAM_ADD}"; then
-                            warning "failed to add team: ${TEAM_ADD}"
-                        fi
-
-
-                        if [[ "$(team_from_yaml)" != "${TEAM_ADD}" ]] \
-                        || [[ "$(team_from_yaml)" == "null" ]]; then
-                            update_yaml_team "${TEAM_ADD}"
-                            git add "${REPO_DB}"
-                            git commit -m "Set team ${TEAM_ADD}"
-                        fi
-
-                    fi
-
-                    if [[ -n ${TEAM_RM} ]]; then
-
-                        if ! remove_team_from_repo "${gitname}" "${TEAM_RM}"; then
-                            warning "failed to add team: ${TEAM_RM}"
-                        fi
-
-                    fi
-
-                    msg "Querying ${pkgbase} ..."
-                    if ! show_db; then
-                        warning "Could not query ${REPO_DB}"
-                    fi
-
-                )
-            fi
-
-        done
-
-    fi
-
-}

src/lib/pkg/admin/topic.sh

@@ -1,139 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${ARTOOLS_INCLUDE_ADMIN_TOPIC_SH:-} ]] || return 0
-ARTOOLS_INCLUDE_ADMIN_TOPIC_SH=1
-
-set -e
-
-
-artixpkg_admin_topic_usage() {
-    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-    Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-    OPTIONS
-        -a, --add NAME             Add a topic to repo
-        -r, --remove NAME          Remove a topic from repo
-        -d, --delete               Delete all topics from repo
-        -j, --jobs N               Run up to N jobs in parallel (default: $(nproc))
-        -h, --help                 Show this help text
-
-    EXAMPLES
-        $ ${COMMAND} --add mytopic libfoo
-        $ ${COMMAND} --remove mytopic libbar
-        $ ${COMMAND} --add mytopic libfoo libbar
-        $ ${COMMAND} --remove mytopic libfoo libbar
-        $ ${COMMAND} --delete libfoo
-_EOF_
-}
-
-
-
-artixpkg_admin_topic() {
-    if (( $# < 1 )); then
-        artixpkg_admin_topic_usage
-        exit 0
-    fi
-
-    # options
-    local pkgbases=()
-    local pkgbase
-
-    local ADD_TOPIC
-    local RM_TOPIC
-    local ADD=0
-    local RM=0
-    local DEL=0
-    local jobs=
-    jobs=$(nproc)
-
-    local RUNCMD=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-
-    while (( $# )); do
-        case $1 in
-            -h|--help)
-                artixpkg_admin_topic_usage
-                exit 0
-            ;;
-            -a|--add)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                ADD_TOPIC="$2"
-                ADD=1
-                RUNCMD+=" $1 ${ADD_TOPIC}"
-                shift 2
-            ;;
-            -r|--remove)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                RM_TOPIC="$2"
-                RM=1
-                RUNCMD+=" $1 ${RM_TOPIC}"
-                shift 2
-            ;;
-            -d|--delete)
-                DEL=1
-                RUNCMD+=" $1"
-                shift
-            ;;
-            -j|--jobs)
-                (( $# <= 1 )) && die "missing argument for %s" "$1"
-                jobs=$2
-                shift 2
-            ;;
-            --)
-                shift
-                break
-            ;;
-            -*)
-                die "invalid argument: %s" "$1"
-            ;;
-            *)
-                break
-            ;;
-        esac
-    done
-
-    pkgbases+=("$@")
-
-    if [[ -n ${GIT_TOKEN} ]]; then
-
-        # parallelization
-        if [[ ${jobs} != 1 ]] && (( ${#pkgbases[@]} > 1 )); then
-            if [[ -n ${BOLD} ]]; then
-                export ARTOOLS_COLOR=always
-            fi
-            if ! parallel --bar --jobs "${jobs}" "${RUNCMD}" ::: "${pkgbases[@]}"; then
-                die 'Failed to manage some topic, please check the output'
-                exit 1
-            fi
-            exit 0
-        fi
-
-        for pkgbase in "${pkgbases[@]}"; do
-            local gitname
-            gitname=$(get_compliant_name "${pkgbase}")
-
-            # topics meta
-            if (( ADD )); then
-                if ! add_topic "${gitname}" "${ADD_TOPIC}"; then
-                    warning "failed to add topic: ${ADD_TOPIC}"
-                fi
-            fi
-
-            if (( RM )); then
-                if ! remove_topic "${gitname}" "${RM_TOPIC}"; then
-                    warning "failed to remove topic: ${RM_TOPIC}"
-                fi
-            fi
-
-            if (( DEL )); then
-                if ! remove_all_topics "${gitname}" "${GIT_ORG}"; then
-                    warning "failed to delete all topics: ${gitname}"
-                fi
-            fi
-
-        done
-
-    fi
-}