artools/0.32.x (#97)

* drop artools-base.conf
* implement validity and remote checks for artixpkg
* backport arch patches for base
* move mkchroot & chroot-run in pkg
* buildiso calamares setup using yq instead of yaml shell lib

Reviewed-on: #97
Co-authored-by: Artoo <artoo@artixlinux.org>
Co-committed-by: Artoo <artoo@artixlinux.org>

.github/workflows/lint.yaml

@@ -0,0 +1,28 @@
+name: Artools shellcheck
+run-name: ${{ gitea.actor }}
+on:
+  push:
+    branches:
+      - artools/0.32.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 artools
+        run: make
+      - name: shellcheck artools
+        uses: ludeeus/action-shellcheck@master
+        env:
+          SHELLCHECK_OPTS: -x -e SC2034
+        with:
+          scandir: './build/bin'
+          format: tty
+

.gitignore

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

LICENSE

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

Makefile

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

README.md

@@ -12,44 +12,55 @@ artools
 ##### Buildtime:
 
 * make
-* git
-* m4
+* shellcheck
 
 ##### Runtime:
 
 - base:
-  * openssh
-  * rsync
-  * haveged
-  * os-prober
-  * gnupg
+  * awk
+  * bash
+  * coreutils
+  * grep
   * pacman
+  * util-linux
+  * sed
 
 - pkg:
-  * namcap
-  * git-subrepo
-  * jq
+  * artools-base
+  * binutils
+  * diffutils
+  * findutils
+  * go-yq
+  * openssh
+  * parallel
+  * rsync
 
 - iso:
+  * artools-base
   * dosfstools
-  * libisoburn
-  * squashfs-tools
-  * mkinitcpio
+  * e2fsprogs
+  * findutils
   * grub
+  * libarchive
+  * libisoburn
+  * mtools
+  * squashfs-tools
+  * go-yq
+
 
 #### Configuration
 
-artools-{base,pkg,iso}.conf are the configuration files for artools.
+artools-{pkg,iso}.conf are the configuration files for artools.
 By default, the config files are installed in
 
 ```bash
-/etc/artools/artools-{base,pkg,iso}.conf
+/etc/artools/artools-{pkg,iso}.conf
 ```
 
-A user artools-{base,pkg,iso}.conf can be placed in
+A user artools-{pkg,iso}.conf can be placed in
 
 ```bash
-$HOME/.config/artools/artools-{base,pkg,iso}.conf
+$HOME/.config/artools/artools-{pkg,iso}.conf
 ```
 
 If the userconfig is present, artools will load the userconfig values, however, if variables have been set in the systemwide
@@ -58,17 +69,31 @@ 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-{base,pkg,iso}.conf or by args.
-Specifying args will override artools-{base,pkg,iso}.conf settings.
+Tools configuration is done in artools-{pkg,iso}.conf or by args.
+Specifying args will override artools-{pkg,iso}.conf settings.
 
 Both, pacman.conf and makepkg.conf for chroots are loaded from
 
 ```bash
-usr/share/artools/{makepkg,pacman-*}.conf
+usr/share/artools/makepkg.conf.d/${arch}.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

@@ -1,151 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-shopt -s extglob
-
-m4_include(lib/base/message.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/base/mount.sh)
-
-#{{{ functions
-
-chroot_part_mount() {
-    info "mount: [%s]" "$2"
-    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
-}
-
-chroot_part_umount() {
-    chroot_api_umount
-    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_PART_MOUNTS
-}
-
-detect(){
-    local detected
-    detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
-    echo "${detected}"
-}
-
-# $1: os-prober array
-get_os_name(){
-    local str=$1
-    str="${str#*:}"
-    str="${str#*:}"
-    str="${str%:*}"
-    echo "$str"
-}
-
-mount_os(){
-    CHROOT_ACTIVE_PART_MOUNTS=()
-    CHROOT_ACTIVE_MOUNTS=()
-
-    trap_setup chroot_part_umount
-
-    chroot_part_mount "$2" "$1"
-
-    local mounts
-    mounts=$(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' "$1"/etc/fstab)
-
-    for entry in ${mounts}; do
-        entry=${entry//UUID=}
-        local dev=${entry%:*} mp=${entry#*:}
-        case "${entry#*:}" in
-            '/'|'swap'|'none') continue ;;
-            *) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
-        esac
-    done
-
-    chroot_setup "$1" true
-    chroot_add_resolv_conf "$1"
-}
-
-select_os(){
-    local os_list=( "$(detect)" ) count=${#os_list[@]}
-    if [[ ${count} -gt 1 ]];then
-        msg "Detected systems:"
-        local i=0
-        for os in "${os_list[@]}"; do
-            local last=${os##*:}
-            case $last in
-                'efi') count=$((count-1)) ;;
-                *) info "$i) $(get_os_name "$os")"; i=$((i+1)) ;;
-            esac
-        done
-        i=0
-        msg "Select system to mount [0-%s] : " "$((count-1))"
-        read -r select
-    else
-        select=0
-    fi
-    local os_str=${os_list[$select]} type
-    type=$os_str
-    root=${os_str%%:*}
-    type=${type##*:}
-    if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name "$os_str")" "$root"
-        mount_os "$1" "$root"
-    else
-        die "You can't mount %s!" "$select"
-    fi
-}
-
-#}}}
-
-automount=false
-
-usage() {
-    echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
-    echo '    -a             Automount detected linux system'
-    echo '    -h             Print this help message'
-    echo ''
-    echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
-    echo ''
-    echo "    If 'automount' is true, ${0##*/} will launch /bin/bash"
-    echo "    and ${chrootdir}."
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts=':ha'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        a) automount=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument ${arg}"; usage 1 ;;
-    esac
-done
-shift $(( OPTIND - 1 ))
-
-check_root
-
-if ${automount};then
-    chrootdir=/mnt
-    run_args=(/bin/bash)
-
-    select_os "${chrootdir}"
-else
-    chrootdir=$1
-    shift
-    run_args=("$@")
-
-    [[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
-
-    chroot_api_mount "${chrootdir}" || die "failed to setup API filesystems in chroot %s" "${chrootdir}"
-    chroot_add_resolv_conf "${chrootdir}"
-fi
-
-SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args[@]}"

bin/base/basestrap.in

@@ -1,126 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-#
-# 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() {
-    echo "usage: ${0##*/} [options] root [packages...]"
-    echo " -C <config>      Use an alternate config file for pacman"
-    echo " -c               Use the package cache on the host, rather than the target"
-    echo " -G               Avoid copying the host's pacman keyring to the target"
-    echo " -i               Avoid auto-confirmation of package selections"
-    echo " -M               Avoid copying the host's mirrorlist to the target"
-    echo ' -U               Use pacman -U to install packages'
-    echo " -h               Print this help message"
-    echo ''
-    echo ' basestrap installs packages to the specified new root directory.'
-    echo ' If no packages are given, basestrap defaults to the "base" group.'
-    echo ''
-    echo ''
-    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 ;;
-        :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
-        ?) 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,186 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/base/message.sh)
-m4_include(lib/base/mount.sh)
-m4_include(lib/base/chroot.sh)
-
-# $1: chroot
-kill_chroot_process(){
-    local prefix="$1" flink pid name
-    for root_dir in /proc/*/root; do
-        flink=$(readlink "$root_dir")
-        if [ "x$flink" != "x" ]; then
-            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
-                # this process is in the chroot...
-                pid=$(basename "$(dirname "$root_dir")")
-                name=$(ps -p "$pid" -o comm=)
-                info "Killing chroot process: %s (%s)" "$name" "$pid"
-                kill -9 "$pid"
-            fi
-        fi
-    done
-}
-
-# umask might have been changed in /etc/profile
-# ensure that sane default is set again
-umask 0022
-
-working_dir=''
-files=()
-
-mount_args=("-B:/etc/hosts:/etc/hosts")
-
-usage() {
-    echo "Usage: ${0##*/} [options] working-dir [run arguments]"
-    echo "A wrapper around chroot. Provides support for pacman."
-    echo
-    echo ' options:'
-    echo '    -C <file>     Location of a pacman config file'
-    echo '    -M <file>     Location of a makepkg config file'
-    echo '    -c <dir>      Set pacman cache'
-    echo '    -f <file>     Copy file from the host to the chroot'
-    echo '    -s            Do not run setarch'
-    echo '    -b <list>     Bind mountargs'
-    echo '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]'
-    echo '    -h            This message'
-    exit 1
-}
-
-opts='hC:M:c:b:f:s'
-
-while getopts ${opts} arg; do
-    case "${arg}" in
-        C) pacman_conf="$OPTARG" ;;
-        M) makepkg_conf="$OPTARG" ;;
-        c) cache_dirs+=("$OPTARG") ;;
-        f) files+=("$OPTARG") ;;
-        s) nosetarch=1 ;;
-        b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
-        h|?) usage ;;
-        *) error "invalid argument '$arg'"; usage ;;
-    esac
-done
-shift $(( OPTIND - 1 ))
-
-(( $# < 1 )) && die 'You must specify a directory.'
-
-check_root
-
-working_dir=$(readlink -f "$1")
-shift 1
-
-[[ -z $working_dir ]] && die 'Please specify a working directory.'
-
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
-if (( ${#cache_dirs[@]} == 0 )); then
-    mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
-fi
-
-# shellcheck disable=2016
-host_mirrors=($("$pacconf_cmd" --repo world Server 2> /dev/null | sed -r 's#(.*/)world/os/.*#\1$repo/os/$arch#'))
-
-for host_mirror in "${host_mirrors[@]}"; do
-    if [[ $host_mirror == *file://* ]]; then
-        # shellcheck disable=2016
-        host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
-        info "host mirror: %s" "$host_mirror"
-        in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
-    fi
-done
-
-while read -r line; do
-    # shellcheck disable=2016
-    mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
-        --repo "$line" Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
-    for line in "${lines[@]}"; do
-        if [[ $line = file://* ]]; then
-            line=${line#file://}
-            in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
-        fi
-    done
-done < <("$pacconf_cmd" --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
-
-copy_hostconf () {
-    unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
-    pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
-
-    printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
-
-    [[ -n $pacman_conf ]] && cp "$pacman_conf" "${working_dir}/etc/pacman.conf"
-
-    [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "${working_dir}/etc/makepkg.conf"
-
-    local file
-    for file in "${files[@]}"; do
-        mkdir -p "$(dirname "$working_dir$file")"
-        cp -T "$file" "$working_dir$file"
-    done
-
-    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
-        local flag=${arg%%:*}
-        local dest=${arg##*:}
-        local src=${arg%:*}
-        src=${src#*:}
-        chroot_mount "${src}" "${working_dir}${dest}" "${flag}"
-    done
-}
-
-sync_host_localtime(){
-    if [[ -e /etc/localtime ]]; then
-        cp -L /etc/localtime "${working_dir}"/etc/localtime
-    fi
-}
-
-umask 0022
-
-# Sanity check
-if [[ ! -f "$working_dir/.artools" ]]; then
-    die "'%s' does not appear to be an artix chroot." "$working_dir"
-elif [[ $(cat "$working_dir/.artools") != "${CHROOTVERSION}" ]]; then
-    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "${CHROOTVERSION}"
-fi
-
-#sync_host_localtime
-
-chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"
-
-chroot_extra_mount
-
-copy_hostconf
-
-eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
-
-[[ -z $nosetarch ]] || unset CARCH
-
-${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
-
-ret=$?
-
-kill_chroot_process "${working_dir}"
-
-exit $ret

bin/pkg/batchpkg.in

@@ -1,115 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-20 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-
-#{{{ functions
-
-batch_move() {
-    local name="${1:-pkg_moves}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local src=${entry%:*}
-        src=${src#*:}
-        local dest=${entry%%:*}
-        if ${runlist}; then
-            "${dest}"pkg -s "${src}" -u -p "${pkg}"
-        else
-            msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_create() {
-    local name="${1:-pkg_create}"
-    local pkglist="${TREE_DIR_ARTIX}"/"$name".list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry##*:}
-        local group=${entry%:*}
-        group=${group#*:}
-        local team=${entry%%:*}
-        if ${runlist}; then
-            buildtree -n -p "${pkg}" -t "${team}" -g "${group}"
-            buildtree -i -p "${pkg}"
-            commitpkg -p "${pkg}"
-        else
-            msg "%s" "buildtree -n -p ${pkg} -t ${team} -g ${group}"
-            msg2 "%s" "buildtree -i -p ${pkg}"
-            msg2 "%s" "commitpkg -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-batch_update() {
-    local name="${1:-pkg_upgrades}"
-    local pkglist=${TREE_DIR_ARTIX}/$name.list
-    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-    while read -r entry; do
-        local pkg=${entry#*:}
-        local dest=${entry%:*}
-        if ${runlist}; then
-            buildtree -i -p "${pkg}"
-            "${dest}"pkg -u -p "${pkg}"
-        else
-            msg "buildtree -i -p ${pkg}"
-            msg2 "${dest}pkg -u -p ${pkg}"
-        fi
-    done < "$pkglist"
-}
-
-#}}}
-
-usage() {
-    echo "Usage: ${0##*/} [optional listname]"
-    echo '    -r                 Run generated commands'
-    echo '    -c                 Create subrepos from list'
-    echo '    -u                 Update subrepos from list'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-runlist=false
-create=false
-update=false
-
-opts='rcuh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) runlist=true ;;
-        c) create=true ;;
-        u) update=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-listname="$1"; shift
-
-if ${create}; then
-    batch_create "${listname}"
-elif ${update}; then
-    batch_update "${listname}"
-else
-    batch_move "${listname}"
-fi

bin/pkg/buildpkg.in

@@ -1,115 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/base/common.sh)
-m4_include(lib/base/chroot.sh)
-
-create_first=false
-rebuild=false
-
-mkchrootpkg_args=(-c -n)
-
-cmd=${0##*/}
-repo=${cmd#*-}
-base_devel=('base-devel')
-chroots_pkg="${CHROOTS_DIR}/buildpkg"
-arch=$(uname -m)
-
-usage() {
-    echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
-    echo "    -r <dir>           Create chroots in this directory"
-    echo "    -d <dir>           Destination repo chroot"
-    echo '    -c                 Recreate the chroot before building'
-    echo '    -m                 Major rebuild'
-    echo '    -N                 Disable check() function'
-    echo '    -C                 Run checkpkg after built'
-    echo '    -h                 This help'
-    echo ''
-    echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
-    echo ''
-    exit "$1"
-}
-
-opts='hcCNmr:d:'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        r) chroots_pkg="$OPTARG" ;;
-        d) repo="$OPTARG" ;;
-        c) create_first=true ;;
-        m) rebuild=true ;;
-        C) mkchrootpkg_args+=(-C) ;;
-        N) mkchrootpkg_args+=(-N) ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
-    esac
-done
-
-if ${rebuild};then
-    repo='default'
-else
-    case ${repo} in
-        system|world|galaxy) repo='default' ;;
-        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repo=${repo#*-} ;;
-    esac
-fi
-
-get_pacman_conf "${repo}"
-
-get_makepkg_conf
-
-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 "${arch}" mkchroot \
-        -C "${pacman_conf}" \
-        -M "${makepkg_conf}" \
-        "${chroots_pkg}/${repo}-${arch}/root" \
-        "${base_devel[@]}" || abort
-else
-    lock 9 "${chroots_pkg}/${repo}-${arch}/root.lock" "Locking clean chroot"
-    chroot-run \
-        -C "${pacman_conf}" \
-        -M "${makepkg_conf}" \
-        "${chroots_pkg}/${repo}-${arch}/root" \
-        pacman -Syuu --noconfirm || abort
-fi
-
-# Always build official packages reproducibly
-if [[ ! -v SOURCE_DATE_EPOCH ]]; then
-    export SOURCE_DATE_EPOCH=$(date +%s)
-fi
-
-msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
-exec mkchrootpkg -r "${chroots_pkg}/${repo}-${arch}" "${mkchrootpkg_args[@]}"

bin/pkg/buildtree.in

@@ -1,351 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/git.sh)
-m4_include(lib/pkg/repo.sh)
-m4_include(lib/pkg/jenkins.sh)
-
-#{{{ new git repo
-
-get_compliant_name(){
-    local gitname="$1"
-    case "$gitname" in
-        *+) gitname=${gitname//+/plus} ;;
-        *+*) gitname=${gitname//+/-} ;;
-    esac
-    echo "$gitname"
-}
-
-subrepo_clone(){
-    local pkg="$1" org="$2"
-    local gitname
-    gitname=$(get_compliant_name "$pkg")
-    msg2 "Subrepo clone [%s] from (%s)" "$pkg" "$org/$gitname"
-    git subrepo clone "${GIT_SSH}":"$org"/"$gitname".git "$pkg"
-}
-
-create_repo() {
-    local pkg="$1" org="$2"
-    local gitname
-    gitname=$(get_compliant_name "$pkg")
-    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
-
-    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
-
-    curl -s -X POST "${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}" \
-        -H "accept: application/json" \
-        -H "content-type: application/json" \
-        -d "$json"
-
-    echo
-}
-
-subrepo_new(){
-    cd "${TREE_DIR_ARTIX}/${GROUP}" || return
-
-    local org
-    org=$(get_pkg_org "${PACKAGE}")
-
-    create_repo "${PACKAGE}" "$org"
-
-    add_repo_to_team "${PACKAGE}" "$org" "${TEAM}"
-
-    subrepo_clone "${PACKAGE}" "$org"
-
-    mkdir -p "${TREE_DIR_ARTIX}/${GROUP}/${PACKAGE}/trunk"
-
-    commit_jenkins_files "${PACKAGE}"
-}
-
-#}}}
-
-#{{{ pull
-
-clone_tree(){
-    local url="$1" tree="$2" os="${3:-Artix}"
-
-    msg "Cloning %s (%s) ..." "$tree" "$os"
-
-    git clone "$url/$tree".git
-}
-
-pull_tree_arch(){
-    cd "${TREE_DIR_ARCH}" || return
-    for tree in "${ARCH_TREE[@]}";do
-        if [[ -d "${tree}" ]];then
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)" "Arch"
-            )
-        else
-            clone_tree "${host_tree_arch}" "${tree}" "Arch"
-        fi
-    done
-}
-
-config_tree(){
-    local tree="$1"
-    cd "$tree" || return
-        git config --bool pull.rebase true
-        git config commit.gpgsign true
-        if [[ -n "${GPGKEY}" ]];then
-            git config user.signingkey "${GPGKEY}"
-        else
-            warning "No GPGKEY configured in makepkg.conf!"
-        fi
-    cd ..
-}
-
-pull_tree_artix(){
-    local repos=()
-    if ${sync_group}; then
-        repos=("${GROUP}")
-    else
-        repos=("${ARTIX_TREE[@]}")
-    fi
-    cd "${TREE_DIR_ARTIX}" || return
-    for tree in "${repos[@]}"; do
-        if [[ -d "${tree}" ]];then
-            config_tree "${tree}"
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)"
-            )
-        else
-            clone_tree "${host_tree_artix}" "${tree}"
-            config_tree "${tree}"
-        fi
-    done
-}
-
-#}}}
-
-#{{{ patch
-
-patch_pkg(){
-    local pkgpath="$1"
-    local pkg=${pkgpath%/*}
-    pkg=${pkg##*/}
-    case $pkg in
-        glibc)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
-                -e '/nscd.service/d' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-        linux|linux-lts)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "$pkgpath"/PKGBUILD
-            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i "$pkgpath"/config
-        ;;
-        bash)
-            msg2 "Patching %s" "$pkg"
-            # shellcheck disable=2016
-            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
-            -e "s|etc/bash.|etc/bash/|g" \
-            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
-            -i "$pkgpath"/PKGBUILD
-            ( cd "$pkgpath" || return
-                patch -Np 1 -i "${DATADIR}"/patches/artix-bash.patch
-                updpkgsums
-            )
-        ;;
-        gstreamer|gst-plugins-*|licenses)
-            msg2 "Patching %s" "$pkg"
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
-                -e 's|(Arch Linux)|(Artix Linux)|' \
-                -i "$pkgpath"/PKGBUILD
-        ;;
-    esac
-}
-
-#}}}
-
-#{{{ pkgbuild import
-
-sync_pkg(){
-    local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
-    local src="$1" dest="$2"
-    msg "Sync from Arch [%s] to Artix [%s]" "${src##*archlinux/}" "${dest##*artixlinux/}"
-    rsync "${rsync_args[@]}" "$src"/ "$dest"/
-}
-
-show_deps(){
-    local src="$1" archver
-
-    # shellcheck disable=1090
-    . "$src"/PKGBUILD 2>/dev/null
-
-    archver=$(get_full_version)
-
-    # shellcheck disable=2154
-    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
-    # shellcheck disable=2154
-    msg2 "pkgname: %s" "${pkgname[*]}"
-    # shellcheck disable=2154
-    [[ -n "${pkgdesc}" ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
-    # shellcheck disable=2154
-    msg2 "Arch Version: %s" "$archver"
-    # shellcheck disable=2154
-    msg2 "arch: %s" "$arch"
-    # shellcheck disable=2154
-    [[ -n ${makedepends[*]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${checkdepends[*]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${depends[*]} ]] && msg2 "depends: %s" "${depends[*]}"
-    # shellcheck disable=2154
-    [[ -n ${optdepends[*]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
-}
-
-from_arch(){
-    cd "${TREE_DIR_ARTIX}" || return
-
-    local srcpath repo archpath artixpath
-    srcpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-
-    repo=$(find_repo "$srcpath")
-    msg "repo: %s" "${repo#*/}"
-
-    archpath=$srcpath/$repo
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
-
-    show_deps "$archpath"
-
-    if [[ -f "$artixpath"/.gitrepo ]]; then
-        artixpath="$artixpath"/trunk
-
-        if [[ -d "$artixpath" ]];then
-            sync_pkg "$archpath" "$artixpath"
-            patch_pkg "$artixpath"
-        fi
-    else
-        die "Package '%s' does not exist!" "${PACKAGE}"
-    fi
-}
-
-#}}}
-
-view_build(){
-    local archpath repo
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-    repo=$(find_repo "${archpath}")
-    archpath=$archpath/$repo
-    msg "repo: %s" "${repo#*/}"
-    show_deps "$archpath"
-}
-
-check_tree(){
-    local archpath artixpath group
-    archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
-    group=${artixpath%/*}
-    msg "group: %s" "${group##*/}"
-
-    [[ -z $artixpath ]] && msg2 "exists: %s" "no"
-    [[ -n $artixpath ]] && msg2 "exists: %s" "yes"
-}
-
-sync_repos(){
-    ${sync_arch} && pull_tree_arch
-    ${sync_artix} && pull_tree_artix
-}
-
-load_makepkg_config
-
-testing=true
-staging=true
-unstable=false
-
-sync=false
-sync_arch=true
-sync_artix=true
-import=false
-view=false
-createnew=false
-sync_group=false
-check=false
-
-PACKAGE=''
-
-TEAM='community'
-GROUP="${ARTIX_TREE[0]}"
-
-host_tree_artix="${GIT_SSH}:artixlinux"
-host_tree_arch='git://git.archlinux.org/svntogit'
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo '    -p <pkg>      Package name'
-    echo '    -t <team>     Team name (only with -n)'
-    echo '                  Possible values: core,extra,community,multilib'
-    echo "                  [default: ${TEAM}]"
-    echo '    -g <group>    Group name, the superrepo (only with -n or -s)'
-    echo "                  [default: ${GROUP}]"
-    echo "    -s            Clone or pull repos"
-    echo "    -a            Don't clone or pull arch repos"
-    echo "    -b            Don't clone or pull artix repos"
-    echo '    -i            Import a package from arch repos'
-    echo '    -n            New remote subrepo and clone it'
-    echo '    -v            Check if a package is in the artix tree(s)'
-    echo '    -c            View package depends'
-    echo '    -x            Exclude testing (only with -i)'
-    echo '    -y            Exclude staging (only with -i)'
-    echo '    -z            Include kde & gnome unstable (only with -i)'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='p:t:g:sinabcvxyzh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) PACKAGE="$OPTARG" ;;
-        t) TEAM="$OPTARG" ;;
-        g) GROUP="$OPTARG"; sync_group=true ;;
-        s) sync=true ;;
-        a) sync_arch=false ;;
-        b) sync_artix=false ;;
-        i) import=true ;;
-        n) createnew=true ;;
-        c) check=true ;;
-        v) view=true ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-set_arch_repos "$testing" "$staging" "$unstable"
-
-${sync} && sync_repos
-
-${view} && view_build
-
-${check} && check_tree
-
-${import} && from_arch
-
-${createnew} && subrepo_new

bin/pkg/commitpkg.in

@@ -1,258 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/git.sh)
-m4_include(lib/pkg/repo.sh)
-
-#{{{ functions
-
-push_tree(){
-    local tree="$1"
-    msg "Update (%s)" "${tree}"
-    git push origin master
-}
-
-subrepo_push(){
-    local pkg="$1"
-    msg2 "Subrepo push (%s)" "$pkg"
-    git subrepo push "$pkg" || die "%s push failed" "$pkg"
-}
-
-subrepo_clean(){
-    local pkg="$1"
-    msg2 "Subrepo clean (%s)" "$pkg"
-    git subrepo clean "$pkg"
-}
-
-subrepo_pull(){
-    local pkg="$1"
-    msg2 "Subrepo pull (%s)" "$pkg"
-    git subrepo pull "$pkg"
-}
-
-prepare_commit(){
-    # create new layout, copy & remove repos
-    if [[ -d repos ]]; then
-        msg "Switching to new layout ..."
-        [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-
-        for r in repos/*; do
-            local name noarch
-            name=${r#*/}
-            noarch=${name%-*}
-            mkdir "$CARCH/${noarch}"
-            cp repos/"${name}"/* "$CARCH/${noarch}/"
-            git add "$CARCH/${noarch}"
-        done
-
-        git rm -r repos
-        git commit -m "switch to new repo layout"
-        msg "Done switch"
-    fi
-
-    if [[ $action == 'add' ]] || [[ $action == 'move' ]] ;then
-        [[ -d "$CARCH/${REPO_DEST}" ]] && git rm -r "$CARCH/${REPO_DEST}"
-        [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
-        [[ ! -d "$CARCH/${REPO_DEST}" ]] && mkdir "$CARCH/${REPO_DEST}"
-    fi
-}
-
-check_rebuild(){
-    if [[ -d "$CARCH"/"${valid_names[10]}" ]] \
-    && [[ "${REPO_DEST}" == "${valid_names[7]}" ]]; then
-        git rm -r "$CARCH"/"${valid_names[10]}"
-        git commit -m "switch from ${valid_names[10]} to ${valid_names[7]}"
-    elif [[ -d "$CARCH"/"${valid_names[7]}" ]] \
-    && [[ "${REPO_DEST}" == "${valid_names[10]}" ]]; then
-        git rm -r "$CARCH"/"${valid_names[7]}"
-        git commit -m "switch from ${valid_names[7]} to ${valid_names[10]}"
-    fi
-}
-
-check_team(){
-    if [[ "${REPO_SRC}" == "${valid_names[0]}" \
-    && "${REPO_DEST}" == "${valid_names[1]}" ]] || \
-        [[ "${REPO_SRC}" == "${valid_names[1]}" \
-        && "${REPO_DEST}" == "${valid_names[0]}" ]] || \
-        [[ "${REPO_SRC}" == "${valid_names[1]}" \
-        && "${REPO_DEST}" == "${valid_names[2]}" ]] || \
-        [[ "${REPO_SRC}" == "${valid_names[2]}" \
-        && "${REPO_DEST}" == "${valid_names[1]}" ]] ;then
-
-        local org
-        org=$(get_pkg_org "${PACKAGE}")
-        add_repo_to_team "${PACKAGE}" "$org" "${REPO_DEST}"
-        remove_repo_from_team "${PACKAGE}" "$org" "${REPO_SRC}"
-    fi
-}
-
-path_config() {
-    [[ "${REPO_SRC}" != 'trunk' ]] && pkgbuild="$CARCH/${REPO_SRC}"/PKGBUILD
-
-    if [[ ! -f "$pkgbuild" ]]; then
-        pkgbuild=repos/"${REPO_SRC}-${CARCH}"/PKGBUILD
-        [[ -f repos/"${REPO_SRC}"-any/PKGBUILD ]] && pkgbuild=repos/"${REPO_SRC}"-any/PKGBUILD
-    fi
-
-    # shellcheck disable=1090
-    . "$pkgbuild"
-}
-
-commit_pkg() {
-    local commit_msg pkg
-    if ${remove};then
-        action='remove'
-        if [[ "${REPO_SRC}" == 'trunk' ]];then
-            pkg=${PACKAGE}
-            git rm -r trunk
-        else
-            pkg="${PACKAGE}-$(get_full_version)"
-
-            prepare_commit
-
-            git rm -r "$CARCH/${REPO_SRC}"
-        fi
-        commit_msg="[${REPO_SRC}] '$pkg' ${action}"
-        msg "Action: %s" "$commit_msg"
-    else
-        action='modify'
-        commit_msg="[${REPO_SRC}] '${PACKAGE}-$(get_full_version)' ${action}"
-        msg "Action: %s" "$commit_msg"
-        git add .
-    fi
-    git commit -m "$commit_msg"
-}
-
-repo_commit_pkg() {
-    local commit_msg
-    if [[ "${REPO_SRC}" == 'trunk' ]];then
-        action='add'
-
-        prepare_commit
-        check_rebuild
-
-        cp trunk/* "$CARCH/${REPO_DEST}"/
-    else
-        action='move'
-        [[ ! -f $pkgbuild ]] && die "%s does not exist!" "$pkgbuild"
-
-        prepare_commit
-
-        cp "$CARCH/${REPO_SRC}"/* "$CARCH/${REPO_DEST}"/
-        git rm -r "$CARCH/${REPO_SRC}"
-    fi
-    commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$(get_full_version)' ${action}"
-    msg "Action: %s" "$commit_msg"
-
-    git add .
-    git commit -m "$commit_msg"
-}
-
-run(){
-    local artixpath head group
-    artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
-    if [[ -n ${artixpath} ]];then
-        group=${artixpath%/*}
-        cd "${group}" || return
-        head=$(get_local_head)
-
-        cd "${artixpath}" || return
-
-        path_config
-
-        if [[ "${cmd}" == 'commitpkg' ]];then
-            commit_pkg
-        else
-            repo_commit_pkg
-        fi
-
-        cd "${group}" || return
-
-        ${push} && pull_tree "${group##*/}" "$head"
-#         subrepo_pull "${PACKAGE}"
-        subrepo_push "${PACKAGE}"
-        subrepo_clean "${PACKAGE}"
-
-        ${push} && push_tree "${group##*/}"
-
-        git prune
-
-        [[ "${cmd}" != 'commitpkg' ]] && check_team
-    else
-        die "Package '%s' does not exist!" "${PACKAGE}"
-    fi
-}
-
-is_valid_repo(){
-    local _valid=trunk
-    for repo in "${valid_names[@]}"; do
-        _valid=${repo:-}${repo:+|}$_valid
-    done
-    eval "case ${REPO_SRC} in
-        ${_valid}) return 0 ;;
-        *) return 1 ;;
-    esac"
-}
-
-#}}}
-
-load_makepkg_config
-
-REPO_SRC='trunk'
-PACKAGE=''
-remove=false
-push=false
-
-pkgbuild=trunk/PKGBUILD
-
-cmd=${0##*/}
-REPO_DEST=${cmd%pkg}
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -s <name>          Source repository [default:${REPO_SRC}]"
-    echo '    -p <pkg>           Package name'
-    echo '    -r                 Delete from repo (commitpkg only)'
-    echo '    -u                 Push'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='p:s:urh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        s) REPO_SRC="$OPTARG" ;;
-        p) PACKAGE="$OPTARG" ;;
-        r) remove=true ;;
-        u) push=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-set_arch_repos "false" "false" "false"
-
-if is_valid_repo;then
-    run
-else
-    die "source repository '%s' is not valid!" "${REPO_SRC}"
-fi

bin/pkg/comparepkg.in

@@ -1,373 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/repo.sh)
-
-#{{{ table
-
-msg_table_header(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
-}
-
-msg_row_downgrade(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg_row_notify(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg_row(){
-    local mesg=$1; shift
-#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-    # shellcheck disable=2059
-    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg_row_upgrade(){
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
-}
-
-#}}}
-
-#{{{ upgrades, downgrades, moves
-
-compare_m(){
-    result=$(vercmp "$artixver" "$archver")
-    case ${artixrepo} in
-        *testing*|*staging*|*rebuild)
-            if [[ "${a}" == "${b}" ]] || [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
-                msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-            else
-                msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-                if [[ -n "$archrepo" ]]; then
-                    printf "%s\n" "${a}:${b}:$pkg" >> "${TREE_DIR_ARTIX}"/pkg_moves.list
-                fi
-            fi
-        ;;
-    esac
-}
-
-compare_u(){
-    result=$(vercmp "$artixver" "$archver")
-    if [ "$result" -eq -1 ];then
-        msg_row_upgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        printf "%s\n" "${a}:$pkg" >> "${TREE_DIR_ARTIX}"/pkg_upgrades.list
-    fi
-}
-
-compare_d(){
-    result=$(vercmp "$artixver" "$archver")
-    if [ "$result" -eq 1 ];then
-        if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
-            msg_row_downgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-        fi
-    fi
-}
-
-get_archpath(){
-    local pkg="$1" archpath
-
-    for tree in "${ARCH_TREE[@]}"; do
-        [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
-    done
-    echo "$archpath"
-}
-
-pre_compare(){
-    local func="$1" pkgpath="$2" result group
-    group="${pkgpath%/*}"
-    group=${group##*/}
-
-    local pkg artixrepo archrepo pkgbuild artixver archver archpath node a b
-    pkg=${pkgpath##*/}
-    artixrepo=$(find_repo "$pkgpath")
-    pkgbuild=$pkgpath/$artixrepo/PKGBUILD
-
-    if [[ -f $pkgbuild ]]; then
-        # shellcheck disable=1090
-        . "$pkgbuild" 2>/dev/null
-        artixver=$(get_full_version)
-        archpath=$(get_archpath "$pkg")
-        archrepo=$(find_repo "${archpath}")
-        pkgbuild=$archpath/$archrepo/PKGBUILD
-        node=${artixrepo%/*}
-        a=${archrepo#*/} b=${artixrepo#*/}
-        a="${a%-*}"
-
-        [[ "$node" != "$CARCH" ]] && b=${b%-*}
-
-        if [[ -f "$pkgbuild" ]]; then
-            # shellcheck disable=1090
-            . "$pkgbuild" 2>/dev/null
-            archver=$(get_full_version)
-        fi
-
-        "$func"
-
-        unset pkgver epoch pkgrel artixver archver pkgbuild archpath
-    fi
-}
-
-compare_upgrades(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_u "$pkgpath"
-}
-
-compare_downgrades(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_d "$pkgpath"
-}
-
-compare_move(){
-    local pkgpath="${1%/*}"
-    pre_compare compare_m "$pkgpath"
-}
-
-#}}}
-
-#{{{ functions
-
-tree_loop(){
-    local func="$1"
-    for tree in "${ARTIX_TREE[@]}"; do
-        for package in $(find "${TREE_DIR_ARTIX}/$tree" -name trunk); do
-            "$func" "$package"
-        done
-    done
-}
-
-show_compare_header(){
-    msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
-}
-
-show_upgrades_table(){
-    show_compare_header
-    [[ -f "${TREE_DIR_ARTIX}"/pkg_upgrades.list ]] && rm "${TREE_DIR_ARTIX}"/pkg_upgrades.list
-    tree_loop compare_upgrades
-}
-
-show_downgrades_table(){
-    show_compare_header
-    tree_loop compare_downgrades
-}
-
-show_move_table(){
-    show_compare_header
-    [[ -f "${TREE_DIR_ARTIX}"/pkg_moves.list ]] && rm "${TREE_DIR_ARTIX}"/pkg_moves.list
-    tree_loop compare_move
-}
-
-update_db_cache(){
-    msg "Updating database cache"
-    for repo in "${searchrepos[@]}"; do
-        local cachedir=${db_cache_dir}/${linksdb_ext}/${CARCH}/${repo}
-        rm -rf "$cachedir"
-        mkdir -p "$cachedir"
-        msg2 "%s" "$repo"
-        curl -L -s "${REPOS_MIRROR}/${repo}/os/${CARCH}/${repo}.${linksdb_ext}" \
-            | bsdtar -xf - -C "$cachedir"
-    done
-    msg "Done"
-}
-
-#}}}
-
-#{{{ sogrep
-
-query_db() {
-    for repo in "${searchrepos[@]}"; do
-        local db=${db_cache_dir}/${linksdb_ext}/${CARCH}/${repo}/
-        if [[ -d ${db} ]]; then
-            while read -rd '' pkg; do
-                read -r match
-                pkg=${pkg#${db}}
-                pkg="${pkg%/*}"
-                msg_row "${tableQ}" "${repo}" "${pkg}" "${match}"
-            done < <(grep -rZ "${library}" "${db}") | sort -u
-        fi
-    done
-}
-
-show_lib_table() {
-    ${sync} && update_db_cache
-    msg_table_header "${tableQ}" "Repo" "Package" "Library"
-    query_db
-}
-
-#}}}
-
-#{{{ check db
-
-is_db_entry() {
-    local pkgname="$1" repo="${REPOS[$2]}"
-
-    if [[ -d ${db_cache_dir}/${linksdb_ext}/${CARCH}/$repo/$pkgname ]];then
-        return 0
-    fi
-    return 1
-}
-
-check_db(){
-    local pkgpath="${1%/*}"
-
-    for repo in "${!REPOS[@]}"; do
-        local pkgbuild artixver
-        [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]] && pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-$CARCH/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-$CARCH/PKGBUILD
-        [[ -f $pkgpath/repos/$repo-any/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-any/PKGBUILD
-
-        # shellcheck disable=1090
-        . "$pkgbuild" 2>/dev/null
-
-        artixver=$(get_full_version)
-        for name in "${pkgname[@]}"; do
-
-            if ! is_db_entry "$name-$artixver" "$repo"; then
-                msg_row "${tableU}" "$repo" "$name" "$artixver" "false"
-            fi
-
-        done
-        unset artixver pkgbuild pkgver epoch pkgname pkgbase
-    done
-}
-
-show_db_table(){
-    ${sync} && update_db_cache
-    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}"
-
-load_makepkg_config
-
-testing=true
-staging=true
-unstable=false
-
-upgrades=false
-downgrades=false
-move=false
-
-sync=false
-check=false
-query=false
-
-readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
-readonly tableU="%-20s %-35s %-30s %-10s"
-readonly tableQ="%-20s %-45s %s"
-
-usage() {
-    echo "Usage: ${0##*/} [options] (with -q [libname])"
-    echo '    -u            Show upgrade packages'
-    echo '    -d            Show downgrade packages'
-    echo '    -m            Show packages to move'
-    echo "    -x            Don't inlcude testing packages"
-    echo "    -y            Don't inlcude staging packages"
-    echo '    -z            Include unstable kde and gnome'
-    echo "    -s            Sync repo databases"
-    echo '    -c            Check repos'
-    echo "    -q            Query repo databases for so libs"
-    echo '    -r <repo>     Repo name to query'
-    echo '                  [default: all]'
-    echo '    -h            This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='r:qcsudmxyzh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        u) upgrades=true ;;
-        d) downgrades=true ;;
-        m) move=true ;;
-        s) sync=true ;;
-        c) check=true ;;
-        q) query=true ;;
-        r) searchrepos=("$OPTARG") ;;
-        x) testing=false ;;
-        y) staging=false ;;
-        z) unstable=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-library="$1"; shift
-
-set_arch_repos "$testing" "$staging" "$unstable"
-
-#{{{ 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]}]}"
-)
-
-#}}}
-
-${move} && show_move_table
-
-${upgrades} && show_upgrades_table
-
-${downgrades} && show_downgrades_table
-
-${check} && show_db_table
-
-${query} && show_lib_table

bin/pkg/deploypkg.in

@@ -1,97 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-m4_include(lib/util-base.sh)
-m4_include(lib/util-pkg.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/pkg/deploy.sh)
-
-#{{{ functions
-
-add(){
-    if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
-        msg "Found: %s" "${pkgfile}"
-        packages+=("${pkgname}")
-        action='add'
-        ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
-    fi
-}
-
-remove(){
-    packages+=("$pkgname")
-    action='remove'
-    rm -v "$repo_path"/"$pkgname"*.pkg.tar.*
-}
-
-repo_action(){
-    local packages=() action func="$1"
-    for pkgname in "${passfiles[@]}"; do
-        "$func"
-    done
-    cd "$repo_path" || return
-    if [[ -n "${action}" ]]; then
-        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
-        ${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
-    fi
-}
-
-#}}}
-
-load_makepkg_config
-
-pkgdb_ext="db.tar.${DBEXT}"
-linksdb_ext="links.tar.${DBEXT}"
-
-add_pkg=false
-rm_pkg=false
-linksdb=false
-
-cmd=${0##*/}
-dest_repo=${cmd#*-}
-
-usage() {
-    echo "Usage: ${cmd} [options]"
-    echo '    -d <dest>          Destination repository'
-    echo '    -a                 Add package(s) to repository'
-    echo '    -r                 Remove package(s) from repository'
-    echo '    -l                 Use links db'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit "$1"
-}
-
-opts='arlhd:'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        d) dest_repo="$OPTARG" ;;
-        a) add_pkg=true; rm_pkg=false ;;
-        r) rm_pkg=true; add_pkg=false ;;
-        l) linksdb=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-
-passfiles=("$@")
-
-repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
-
-if [[ -n "${passfiles[*]}" ]]; then
-    ${add_pkg} && repo_action add
-    ${rm_pkg} && repo_action remove
-fi

bin/pkg/links-add.in

@@ -1,535 +0,0 @@
-#!/bin/bash
-#
-#   links-add - add a package to a given repo database file
-#   links-remove - remove a package entry from a given repo database file
-#
-#   Copyright (c) 2006-2018 Pacman Development Team <pacman-dev@archlinux.org>
-#   Copyright (c) 2019 artoo@artixlinux.org
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-m4_include(lib/base/message.sh)
-
-shopt -s extglob
-
-declare -r REPO_DB_NAME="links"
-
-QUIET=0
-ONLYADDNEW=0
-SIGN=0
-KEY=0
-VERIFY=0
-REPO_DB_FILE=
-REPO_DB_PREFIX=
-REPO_DB_SUFFIX=
-LOCKFILE=
-CLEAN_LOCK=0
-# PREVENT_DOWNGRADE=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"
-#         printf -- "$(gettext "  -p, --prevent-downgrade  do not add package to database if a newer version is already present\n")"
-    elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Usage: links-remove [options] <path-to-db> <packagename> ...\n"
-        printf -- "\n"
-        printf -- "\
-links-remove will update a package database by removing the package name\n\
-specified on the command line from the given repo database. Multiple\n\
-packages to remove can be specified on the command line.\n"
-        printf -- "\n"
-        printf -- "Options:\n"
-    else
-        printf -- "Please move along, there is nothing to see here.\n"
-        return
-    fi
-    printf -- "  --nocolor         turn off color in output\n"
-    printf -- "  -q, --quiet       minimize output\n"
-    printf -- "  -s, --sign        sign database with GnuPG after update\n"
-    printf -- "  -k, --key <key>   use the specified key to sign the database\n"
-    printf -- "  -v, --verify      verify database's signature before update\n"
-    printf -- "\n\
-See %s(8) for more details and descriptions of the available options.\n" "$cmd"
-    printf "\n"
-    if [[ $cmd == "links-add" ]] ; then
-        printf -- "Example:  links-add /path/to/repo.links.tar.xz pacman-5.1.3-1-x86_64.pkg.tar.xz\n"
-    elif [[ $cmd == "links-remove" ]] ; then
-        printf -- "Example:  links-remove /path/to/repo.links.tar.xz kernel26\n"
-    fi
-}
-
-find_pkgentry() {
-    local pkgname=$1
-    local pkgentry
-
-    for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
-        name=${pkgentry##*/}
-        if [[ ${name%-*-*} = "$pkgname" ]]; then
-            echo "$pkgentry"
-            return 0
-        fi
-    done
-    return 1
-}
-
-check_gpg() {
-    if ! type -p gpg >/dev/null; then
-        error "Cannot find the gpg binary! Is GnuPG installed?"
-        exit 1 # $E_MISSING_PROGRAM
-    fi
-
-    if (( ! VERIFY )); then
-        if ! gpg --list-key "${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 repofile=$1
-
-    case $repofile in
-        *.links.tar.gz)  TAR_OPT="z" ;;
-        *.links.tar.bz2) TAR_OPT="j" ;;
-        *.links.tar.xz)  TAR_OPT="J" ;;
-        *.links.tar.zst) TAR_OPT="--zstd" ;;
-        *.links.tar.Z)   TAR_OPT="Z" ;;
-        *.links.tar)     TAR_OPT="" ;;
-        *) error "'%s' does not have a valid database archive extension." \
-                "$repofile"
-            exit 1 ;;
-    esac
-
-    printf '%s' "$TAR_OPT"
-}
-
-# 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
-#     else
-#         pkgentry=$(find_pkgentry "$pkgname")
-#         if [[ -n $pkgentry ]]; then
-#
-#             local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc")
-#             if (( $(vercmp "$version" "$pkgver") > 0 )); then
-#                 warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname"
-#                 if (( PREVENT_DOWNGRADE )); then
-#                     return 0
-#                 fi
-#             fi
-#         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}
-
-    for f in $(find "$tmppkg" -type f); do
-        readelf -d "$f" 2> /dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'
-    done | sort -u > "$linksentry"
-
-    popd >/dev/null
-    popd >/dev/null
-
-    return 0
-}
-
-# remove existing entries from the DB
-#   arg1 - package name
-db_remove_entry() {
-    local pkgname=$1
-    local notfound=1
-    local pkgentry
-    pkgentry=$(find_pkgentry "$pkgname")
-    while [[ -n $pkgentry ]]; do
-        notfound=0
-
-        msg2 "Removing existing entry '%s'..." \
-        "${pkgentry##*/}"
-        rm -rf "$pkgentry"
-
-        # remove entries in "links" database
-        local linksentry
-        linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
-        rm -rf "$linksentry"
-
-        pkgentry=$(find_pkgentry "$pkgname")
-    done
-    return $notfound
-}
-
-prepare_repo_db() {
-    local repodir dbfile
-
-    # ensure the path to the DB exists; $LOCKFILE is always an absolute path
-    repodir=${LOCKFILE%/*}/
-
-    if [[ ! -d $repodir ]]; then
-        error "%s does not exist or is not a directory." "$repodir"
-        exit 1
-    fi
-
-    # check lock file
-    if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then
-        CLEAN_LOCK=1
-    else
-        error "Failed to acquire lockfile: %s." "$LOCKFILE"
-        [[ -f $LOCKFILE ]] && error "Held by process %s" "$(cat "$LOCKFILE")"
-        exit 1
-    fi
-
-    dbfile=${repodir}/$REPO_DB_PREFIX.${REPO_DB_NAME}.$REPO_DB_SUFFIX
-
-    if [[ -f $dbfile ]]; then
-        # there are two situations we can have here:
-        # a DB with some entries, or a DB with no contents at all.
-        if ! bsdtar -tqf "$dbfile" '*/links' >/dev/null 2>&1; then
-            # check empty case
-            if [[ -n $(bsdtar -tqf "$dbfile" '*' 2>/dev/null) ]]; then
-                error "Repository file '%s' is not a proper links database." "$dbfile"
-                exit 1
-            fi
-        fi
-        verify_signature "$dbfile"
-        msg "Extracting %s to a temporary location..." "${dbfile##*/}"
-        bsdtar -xf "$dbfile" -C "$tmpdir/${REPO_DB_NAME}"
-    else
-        case $cmd in
-            links-remove)
-                # only a missing "db" database is currently an error
-                # TODO: remove if statement
-                if [[ ${REPO_DB_NAME} == "links" ]]; then
-                    error "Repository file '%s' was not found." "$dbfile"
-                    exit 1
-                fi
-                ;;
-            links-add)
-                # check if the file can be created (write permission, directory existence, etc)
-                if ! touch "$dbfile"; then
-                    error "Repository file '%s' could not be created." "$dbfile"
-                    exit 1
-                fi
-                rm -f "$dbfile"
-                ;;
-        esac
-    fi
-}
-
-add() {
-    if [[ ! -f $1 ]]; then
-        error "File '%s' not found." "$1"
-        return 1
-    fi
-
-    pkgfile=$1
-    if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then
-        error "'%s' is not a package file, skipping" "$pkgfile"
-        return 1
-    fi
-
-    msg "Adding package '%s'" "$pkgfile"
-
-    db_write_entry "$pkgfile"
-}
-
-remove() {
-    pkgname=$1
-    msg "Searching for package '%s'..." "$pkgname"
-
-    if ! db_remove_entry "$pkgname"; then
-        error "Package matching '%s' not found." "$pkgname"
-        return 1
-    fi
-
-    return 0
-}
-
-rotate_db() {
-    dirname=${LOCKFILE%/*}
-
-    pushd "$dirname" >/dev/null
-
-    filename=${REPO_DB_PREFIX}.${REPO_DB_NAME}.${REPO_DB_SUFFIX}
-    tempname=$dirname/.tmp.$filename
-
-    # hardlink or move the previous version of the database and signature to .old
-    # extension as a backup measure
-    if [[ -f $filename ]]; then
-        ln -f "$filename" "$filename.old" 2>/dev/null || \
-            mv -f "$filename" "$filename.old"
-
-        if [[ -f $filename.sig ]]; then
-            ln -f "$filename.sig" "$filename.old.sig" 2>/dev/null || \
-                mv -f "$filename.sig" "$filename.old.sig"
-        else
-            rm -f "$filename.old.sig"
-        fi
-    fi
-
-    # rotate the newly-created database and signature into place
-    mv "$tempname" "$filename"
-    if [[ -f $tempname.sig ]]; then
-        mv "$tempname.sig" "$filename.sig"
-    fi
-
-    dblink=${filename%.tar*}
-    rm -f "$dblink" "$dblink.sig"
-    ln -s "$filename" "$dblink" 2>/dev/null || \
-        ln "$filename" "$dblink" 2>/dev/null || \
-        cp "$filename" "$dblink"
-    if [[ -f "$filename.sig" ]]; then
-        ln -s "$filename.sig" "$dblink.sig" 2>/dev/null || \
-            ln "$filename.sig" "$dblink.sig" 2>/dev/null || \
-            cp "$filename.sig" "$dblink.sig"
-    fi
-
-    popd >/dev/null
-}
-
-create_db() {
-    TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE")
-    # $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
-    if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then
-        bsdtar -c"${TAR_OPT}"f "$tempname" *
-    else
-        # we have no packages remaining? zip up some emptyness
-        warning "No packages remain, creating empty database."
-        bsdtar -c"${TAR_OPT}"f "$tempname" -T /dev/null
-    fi
-    popd >/dev/null
-
-    create_signature "$tempname"
-}
-
-trap_exit() {
-    # unhook all traps to avoid race conditions
-    trap '' EXIT TERM HUP QUIT INT ERR
-
-    echo
-    error "$@"
-    clean_up 1
-}
-
-clean_up() {
-    local exit_code=${1:-$?}
-
-    # unhook all traps to avoid race conditions
-    trap '' EXIT TERM HUP QUIT INT ERR
-
-    [[ -d $tmpdir ]] && rm -rf "$tmpdir"
-    (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
-
-    exit "$exit_code"
-}
-
-# PROGRAM START
-case $1 in
-    -h|--help) usage; exit 0;;
-esac
-
-# figure out what program we are
-cmd=${0##*/}
-
-if [[ $cmd != "links-add" && $cmd != "links-remove" ]]; then
-    error "Invalid command name '%s' specified." "$cmd"
-    exit 1
-fi
-
-tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/repo-tools.XXXXXXXXXX") || (\
-    error "Cannot create temp directory for database building."; \
-    exit 1)
-
-for repo in "pkg" "${REPO_DB_NAME}"; do
-    mkdir "$tmpdir/$repo"
-done
-
-trap 'clean_up' EXIT
-for signal in TERM HUP QUIT; do
-    trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal"
-done
-trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
-trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
-
-declare -a args
-# parse arguments
-while (( $# )); do
-    case $1 in
-        -q|--quiet) QUIET=1 ;;
-        -n|--new) ONLYADDNEW=1 ;;
-        -s|--sign) SIGN=1 ;;
-        -k|--key) KEY=1 ; shift; GPGKEY=$1 ;;
-        -v|--verify) VERIFY=1 ;;
-#         -p|--prevent-downgrade) PREVENT_DOWNGRADE=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" >/dev/null
-
-REPO_DB_PREFIX=${REPO_DB_FILE##*/}
-REPO_DB_PREFIX=${REPO_DB_PREFIX%.links.*}
-REPO_DB_SUFFIX=${REPO_DB_FILE##*.links.}
-
-if (( SIGN || VERIFY )); then
-    check_gpg
-fi
-
-if (( VERIFY && ${#args[@]} == 1 )); then
-    dbfile=${repodir}/$REPO_DB_PREFIX.${REPO_DB_NAME}.$REPO_DB_SUFFIX
-
-    if [[ -f $dbfile ]]; then
-        verify_signature "$dbfile"
-    fi
-    exit 0
-fi
-
-prepare_repo_db
-
-fail=0
-for arg in "${args[@]:1}"; do
-    case $cmd in
-        links-add) add "$arg" ;;
-        links-remove) remove "$arg" ;;
-    esac || fail=1
-done
-
-# if the whole operation was a success, re-zip and rotate databases
-if (( !fail )); then
-    msg "Creating updated database file '%s'" "$REPO_DB_FILE"
-    create_db
-    rotate_db
-else
-    msg "No packages modified, nothing to do."
-    exit 1
-fi
-
-exit 0

config/conf/artools-iso.conf

@@ -0,0 +1,37 @@
+#!/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 repos to include
+# possible values: {world,galaxy}{-gremlins,-goblins}
+# REPO="world"
+
+# 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

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

config/makepkg/x86_64.conf

@@ -11,10 +11,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -26,6 +26,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
 VCSCLIENTS=('bzr::bzr'
+            'fossil::fossil'
             'git::git'
             'hg::mercurial'
             'svn::subversion')
@@ -38,21 +39,27 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+#CPPFLAGS=""
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+        -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 \
+         -Wl,-z,pack-relative-relocs"
+LTOFLAGS="-flto=auto"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CFLAGS="-g"
+DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -75,7 +82,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -86,11 +93,12 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
+#-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
+INTEGRITY_CHECK=(sha256)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
 #-- Options to be used when stripping shared libraries. See `man strip' for details.
@@ -146,4 +154,10 @@ COMPRESSLZ=(lzip -c -f)
 PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'
 
+#########################################################################
+# OTHER
+#########################################################################
+#
+#-- Command used to run pacman as root, instead of trying sudo and su
+#PACMAN_AUTH=()
 # vim: set ft=sh ts=2 sw=2 et:

config/pacman/galaxy-goblins-x86_64.conf

@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+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.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional
 
 # 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 archlinux artix`.
+# packagers with `pacman-key --populate artix`.
 
 #
 # REPOSITORIES
@@ -68,15 +70,21 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[goblins]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+[world-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 
@@ -89,18 +97,6 @@ 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]

config/pacman/galaxy-gremlins-x86_64.conf

@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+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.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional
 
 # 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 archlinux artix`.
+# packagers with `pacman-key --populate artix`.
 
 #
 # REPOSITORIES
@@ -68,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 
@@ -83,15 +88,6 @@ 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]

config/pacman/galaxy-x86_64.conf

@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+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.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional
 
 # 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 archlinux artix`.
+# packagers with `pacman-key --populate artix`.
 
 #
 # REPOSITORIES
@@ -68,12 +70,15 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[gremlins]
+#[system-gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+#[world-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 
@@ -83,15 +88,6 @@ 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]

config/pacman/lib32-goblins-x86_64.conf

@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+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.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional
 
 # 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 archlinux artix`.
+# packagers with `pacman-key --populate artix`.
 
 #
 # REPOSITORIES
@@ -68,27 +70,24 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[goblins]
+[system-goblins]
 Include = /etc/pacman.d/mirrorlist
 
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+[world-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 
-[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.
 

config/pacman/lib32-gremlins-x86_64.conf

@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+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.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional
 
 # 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 archlinux artix`.
+# packagers with `pacman-key --populate artix`.
 
 #
 # REPOSITORIES
@@ -68,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.
 
-[gremlins]
+[system-gremlins]
 Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
+[world-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
 [world]
 Include = /etc/pacman.d/mirrorlist
 
-[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.
 

config/pacman/lib32-x86_64.conf

@@ -31,9 +31,11 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-CheckSpace
+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.
@@ -43,7 +45,7 @@ LocalFileSigLevel = Optional
 
 # 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 archlinux artix`.
+# packagers with `pacman-key --populate artix`.
 
 #
 # REPOSITORIES
@@ -68,19 +70,16 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[gremlins]
+#[system-gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
 [system]
 Include = /etc/pacman.d/mirrorlist
 
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-#[galaxy-gremlins]
+#[world-gremlins]
 #Include = /etc/pacman.d/mirrorlist
 
-[galaxy]
+[world]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

config/pacman/system-goblins-x86_64.conf

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

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

@@ -0,0 +1,89 @@
+#
+# /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-goblins-x86_64.conf

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

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

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

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

contrib/iso/profile.conf.example

@@ -0,0 +1,17 @@
+################ 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

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

data/conf/artools-base.conf

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

data/conf/artools-iso.conf

@@ -1,15 +0,0 @@
-#############################################
-################ 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
-# INITSYS="openrc"
-
-# gpg key; leave empty or commented to skip img signing
-# GPG_KEY=""

data/conf/artools-pkg.conf

@@ -1,40 +0,0 @@
-#############################################
-################ artools-pkg ################
-#############################################
-
-# gitea user access token for buildtree
-# GIT_TOKEN=''
-
-# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
-
-# customize buildtree; uncomment to include
-# TREE_NAMES_ARTIX=(
-#         packages-kernel
-#         packages-openrc
-#         packages-runit
-#         packages-s6
-#         packages-python
-#         packages-perl
-#         packages-java
-#         packages-ruby
-#         packages-kf5
-#         packages-plasma
-#         packages-kde
-#         packages-gnome
-#         packages-cinnamon
-#         packages-lxqt
-#         packages-mate
-#         packages-xfce
-#         packages-wm
-#         packages-devel
-#         packages-lib32
-#         packages-qt6
-# )
-
-# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
-
-# default repos root for deploypkg
-# REPOS_ROOT=${WORKSPACE_DIR}/repos
-
-# default mirror for comparepkg -s
-# REPOS_MIRROR="http://mirror1.artixlinux.org/repos"

data/pacman/pacman-docker.conf

@@ -1,111 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-NoExtract  = usr/share/help/* !usr/share/help/en*
-NoExtract  = usr/share/gtk-doc/html/* usr/share/doc/*
-NoExtract  = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
-NoExtract   = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
-NoExtract   = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
-NoExtract   = !usr/share/*locales/trans*
-NoExtract  = usr/share/man/* usr/share/info/*
-NoExtract  = usr/share/vim/vim*/lang/*
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-VerbosePkgLists
-
-
-# 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 archlinux 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
-
-#
-# ARCHLINUX
-#
-
-#[extra]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[community]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-gnome-wobble.conf

@@ -1,111 +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
-#TotalDownload
-CheckSpace
-VerbosePkgLists
-
-# 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 archlinux artix`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[gnome-wobble]
-Include = /etc/pacman.d/mirrorlist
-
-[goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# 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

data/pacman/pacman-kde-wobble.conf

@@ -1,111 +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
-#TotalDownload
-CheckSpace
-VerbosePkgLists
-
-# 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 archlinux artix`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[kde-wobble]
-Include = /etc/pacman.d/mirrorlist
-
-[goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-goblins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy-gremlins]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# 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

data/patches/artix-bash.patch

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

data/valid-names.conf

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

initcpio/Makefile

@@ -1,23 +0,0 @@
-DIRMODE = -dm0755
-MODE =  -m0755
-
-CPIOHOOKS = \
-	$(wildcard hooks/*)
-
-CPIOINST = \
-	$(wildcard install/*)
-
-SCRIPT = \
-	$(wildcard script/*)
-
-install_initcpio:
-	install $(DIRMODE) $(DESTDIR)$(CPIODIR)/hooks
-	install $(MODE) $(CPIOHOOKS) $(DESTDIR)$(CPIODIR)/hooks
-
-	install $(DIRMODE) $(DESTDIR)$(CPIODIR)/install
-	install $(MODE) $(CPIOINST) $(DESTDIR)$(CPIODIR)/install
-	install $(MODE) $(SCRIPT) $(DESTDIR)$(CPIODIR)
-
-install: install_initcpio
-
-.PHONY: install

initcpio/hooks/artix

@@ -1,275 +0,0 @@
-# args: source, newroot, mountpoint
-_mnt_dmsnapshot() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}";
-    local img_name="${img_fullname%%.*}"
-    local dm_snap_name="${dm_snap_prefix}_${img_name}"
-    local ro_dev ro_dev_size rw_dev
-
-    ro_dev=$(losetup --find --show --read-only "${img}")
-    echo ${ro_dev} >> ${live_root}/used_block_devices
-    ro_dev_size=$(blockdev --getsz ${ro_dev})
-
-    if [[ "${cow_persistent}" == "P" ]]; then
-        if [[ -f "${cow}/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '${cow}/${cow_directory}/${img_name}.cow', using as persistent."
-        else
-            msg ":: Creating '${cow}/${cow_directory}/${img_name}.cow' as persistent."
-            truncate -s "${cow_spacesize}" "${cow}/${cow_directory}/${img_name}.cow"
-        fi
-    else
-        if [[ -f "${cow}/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '${cow}/${cow_directory}/${img_name}.cow' but non-persistent requested, removing."
-            rm -f "${cow}/${cow_directory}/${img_name}.cow"
-        fi
-        msg ":: Creating '${cow}/${cow_directory}/${img_name}.cow' as non-persistent."
-        truncate -s "${cow_spacesize}" "${cow}/${cow_directory}/${img_name}.cow"
-    fi
-
-    rw_dev=$(losetup --find --show "${cow}/${cow_directory}/${img_name}.cow")
-    echo ${rw_dev} >> ${live_root}/used_block_devices
-
-    dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
-
-    if [[ "${cow_persistent}" != "P" ]]; then
-        rm -f "${cow}/${cow_directory}/${img_name}.cow"
-    fi
-
-    _mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
-    echo $(readlink -f /dev/mapper/${dm_snap_name}) >> ${live_root}/used_block_devices
-}
-
-# args: source, newroot, mountpoint
-_mnt_overlayfs() {
-    local src="${1}"
-    local newroot="${2}"
-    local mnt="${3}"
-    local work_dir="${overlay_root}/work"
-    local upper_dir="${overlay_root}/upper"
-
-    mkdir -p "${upper_dir}" "${work_dir}"
-
-    mount -t overlay overlay -o lowerdir="${src}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
-}
-
-# args: /path/to/image_file, mountpoint
-_mnt_sfs() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}"
-    local sfs_dev
-    local oper=$( [[ -n "${ip}" && -n "${miso_http_srv}" ]] && echo "mv" || echo "cp" )
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg -n ":: Copying squashfs image to RAM..."
-        if ! "${oper}" "${img}" "${cp2ram}/${img_fullname}" ; then
-            echo "ERROR: while copy '${img}' to '${cp2ram}/${img_fullname}'"
-            launch_interactive_shell
-        fi
-        img="${cp2ram}/${img_fullname}"
-        msg "done."
-    fi
-    sfs_dev=$(losetup --find --show --read-only "${img}")
-    echo ${sfs_dev} >> ${live_root}/used_block_devices
-    _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
-}
-
-# args: device, mountpoint, flags, opts
-_mnt_dev() {
-    local dev="${1}"
-    local mnt="${2}"
-    local flg="${3}"
-    local opts="${4}"
-
-    mkdir -p "${mnt}"
-
-    msg ":: Mounting '${dev}' to '${mnt}'"
-
-    while ! poll_device "${dev}" 30; do
-        echo "ERROR: '${dev}' device did not show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
-        msg ":: Device '${dev}' mounted successfully."
-    else
-        echo "ERROR; Failed to mount '${dev}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-_verify_checksum() {
-    local _status
-    cd "${bootmnt}/${root}"
-    sha512sum -c $1.img.sha512 > /tmp/checksum.log 2>&1
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-_verify_signature() {
-    local _status
-    cd "${bootmnt}/${root}"
-    gpg --homedir /gpg --status-fd 1 --verify $1.img.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-run_hook() {
-    [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
-    [[ -z "${root}" ]] && root="LiveOS"
-
-    [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="artix"
-    [[ -z "${artixdevice}" ]] && artixdevice="/dev/disk/by-label/${label}"
-    [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
-    [[ -z "${overlay_root_size}" ]] && overlay_root_size="75%"
-
-    if [[ -n "${cow_label}" ]]; then
-        cow_device="/dev/disk/by-label/${cow_label}"
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    elif [[ -n "${cow_device}" ]]; then
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    else
-        cow_persistent="N"
-    fi
-
-    [[ -z "${cow_flags}" ]] && cow_flags="defaults"
-    [[ -z "${cow_directory}" ]] && cow_directory="persistent_${label}"
-    [[ -z "${cow_chunksize}" ]] && cow_chunksize="8"
-    [[ -z "${overlay}" ]] && overlay=""
-
-    lower_dir=''
-    live_root="/run/artix"
-    bootmnt="${live_root}/bootmnt"
-    overlay_root="${live_root}/overlay_root"
-    cow="${live_root}/cowspace"
-    cp2ram="${live_root}/copytoram"
-
-    # set mount handler for artix
-    mount_handler="artix_mount_handler"
-}
-
-_check_sum() {
-    local fs="${1}"
-    if [[ -f "${bootmnt}/${root}/${fs}.img" ]]; then
-        if [[ -f "${bootmnt}/${root}/${fs}.img.md5" ]]; then
-            msg -n ":: Self-test requested, please wait..."
-            if _verify_checksum "${fs}"; then
-                msg "done. Checksum is OK, continue booting."
-            else
-                echo "ERROR: one or more files are corrupted"
-                echo "see /tmp/checksum.log for details"
-                launch_interactive_shell
-            fi
-        else
-            echo "ERROR: checksum=y option specified but ${root}/${fs}.img.md5 not found"
-            launch_interactive_shell
-        fi
-    fi
-}
-
-_check_sig() {
-    local fs="${1}"
-    if [[ -f "${bootmnt}/${root}/${fs}.img" ]]; then
-        if [[ -f "${bootmnt}/${root}/${fs}.img.sig" ]]; then
-            msg -n ":: Signature verification requested, please wait..."
-            if _verify_signature "${fs}"; then
-                msg "done. Signature is OK, continue booting."
-            else
-                echo "ERROR: one or more files are corrupted"
-                launch_interactive_shell
-            fi
-        else
-            echo "ERROR: verify=y option specified but ${root}/${fs}.img.sig not found"
-            launch_interactive_shell
-        fi
-    fi
-}
-
-_gen_arg() {
-    local arg="${1}"
-    echo "${lower_dir:-}${lower_dir:+:}${arg}"
-}
-
-_mount_root_overlayfs() {
-    local sfs="${1}"
-    local src="${bootmnt}/${root}"
-    local dest_sfs="${live_root}/sfs"
-    local dest_img="${live_root}/img"
-
-    if [[ -f "${src}/${sfs}.img" ]]; then
-        _mnt_sfs "${src}/${sfs}.img" "${dest_sfs}/${sfs}"
-        local find_img="${dest_sfs}/${sfs}/LiveOS/${sfs}.img"
-        if [[ -f "${find_img}" ]]; then
-            mkdir -p ${dest_img}
-            lower_dir=$(_gen_arg "${dest_img}/${sfs}")
-            _mnt_dmsnapshot "${find_img}" "${dest_img}/${sfs}"
-        else
-            lower_dir=$(_gen_arg "${dest_sfs}/${sfs}")
-        fi
-    fi
-}
-
-# This function is called normally from init script, but it can be called
-# as chain from other mount handlers.
-# args: /path/to/newroot
-artix_mount_handler() {
-    local newroot="${1}"
-
-    if ! mountpoint -q "${bootmnt}"; then
-        _mnt_dev "${artixdevice}" "${bootmnt}" "-r" "defaults"
-        if [[ "${copytoram}" != "y" ]]; then
-            echo $(readlink -f ${artixdevice}) >> ${live_root}/used_block_devices
-        fi
-    fi
-
-    if [[ "${checksum}" == "y" ]]; then
-        _check_sum "rootfs"
-        [[ -n "${overlay}" ]] && _check_sum "${overlay}"
-    fi
-
-    if [[ "${verify}" == "y" ]]; then
-        _check_sig "rootfs"
-        [[ -n "${overlay}" ]] && _check_sig "${overlay}"
-    fi
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Mounting ${cp2ram} (tmpfs) filesystem, size=${copytoram_size}"
-        mkdir -p ${cp2ram}
-        mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram ${cp2ram}
-    fi
-
-    if [[ -n "${cow_device}" ]]; then
-        _mnt_dev "${cow_device}" "${cow}" "-r" "${cow_flags}"
-        echo $(readlink -f ${cow_device}) >> ${live_root}/used_block_devices
-        mount -o remount,rw "${cow}"
-    else
-        msg ":: Mounting ${cow} (tmpfs) filesystem, size=${cow_spacesize}..."
-        mkdir -p ${cow}
-        mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace ${cow}
-    fi
-    mkdir -p -m 0700 "${cow}/${cow_directory}"
-
-    msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..."
-    mkdir -p ${overlay_root}
-    mount -t tmpfs -o "size=${overlay_root_size}",mode=0755 overlay_root ${overlay_root}
-
-    [[ -n "${overlay}" ]] && _mount_root_overlayfs "${overlay}"
-    _mount_root_overlayfs "rootfs"
-
-    _mnt_overlayfs "${lower_dir}" "${newroot}" "/"
-
-    if [[ "${copytoram}" == "y" ]]; then
-        umount -d ${bootmnt}
-        mkdir -p ${bootmnt}/${root}
-        mount -o bind ${cp2ram} ${bootmnt}/${root}
-    fi
-}
-
-# vim:ft=sh:ts=4:sw=4:et:

initcpio/hooks/artix_loop_mnt

@@ -1,35 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}"
-    [[ -z "${img_flags}" ]] && img_flags="defaults"
-    if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then
-        mount_handler="artix_loop_mount_handler"
-    fi
-}
-
-artix_loop_mount_handler () {
-    newroot="${1}"
-
-    local _dev_loop
-
-    msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
-    _mnt_dev "${img_dev}" "${live_root}/img_dev" "-r" "${img_flags}"
-    if [[ "${copytoram}" != "y" ]]; then
-        echo $(readlink -f ${img_dev}) >> ${live_root}/used_block_devices
-    fi
-
-    if _dev_loop=$(losetup --find --show --read-only "${live_root}/img_dev/${img_loop}"); then
-        artixdevice="${_dev_loop}"
-    else
-        echo "ERROR: Setting loopback device for file '${live_root}/img_dev/${img_loop}'"
-        launch_interactive_shell
-    fi
-
-    artix_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        losetup -d ${_dev_loop} 2>/dev/null
-        umount ${live_root}/img_dev
-    fi
-}

initcpio/hooks/artix_pxe_common

@@ -1,72 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    # Do *not* declare 'bootif_dev' local! We need it in run_latehook().
-    local i net_mac bootif_mac
-    # These variables will be parsed from /tmp/net-*.conf generated by ipconfig
-    local DEVICE
-    local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
-    local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
-    local filename
-    # /tmp/net-*.conf
-
-    if [[ -n "${ip}" ]]; then
-        if [[ -n "${BOOTIF}" ]]; then
-            bootif_mac=${BOOTIF#01-}
-            bootif_mac=${bootif_mac//-/:}
-            for i in /sys/class/net/*/address; do
-                read net_mac < ${i}
-                if [[ "${bootif_mac}" == "${net_mac}" ]]; then
-                    bootif_dev=${i#/sys/class/net/}
-                    bootif_dev=${bootif_dev%/address}
-                    break
-                fi
-            done
-            if [[ "${ip}" == "dhcp" ]]; then
-               ip=":::::${bootif_dev}:dhcp"
-            else
-               ip="${ip}::${bootif_dev}"
-           fi
-        fi
-
-        # setup network and save some values
-        if ! ipconfig -t 20 "ip=${ip}"; then
-                echo "ERROR; Failed to configure network"
-                echo "   Falling back to interactive prompt"
-                echo "   You can try to fix the problem manually, log out when you are finished"
-                launch_interactive_shell
-        fi
-
-        . /tmp/net-*.conf
-
-        pxeserver=${ROOTSERVER}
-
-        # setup DNS resolver
-        if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then
-            echo "# added by artix_pxe_common hook" > /etc/resolv.conf
-            echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
-        fi
-        if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
-            echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
-        fi
-        if [[ -n "${DNSDOMAIN}" ]]; then
-            echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
-            echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
-        fi
-    fi
-}
-
-run_latehook () {
-    if [[ -n "${ip}" ]]; then
-        [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
-
-        if [[ "${copytoram}" == "y" ]]; then
-            if [[ -n "${bootif_dev}" ]]; then
-                ip addr flush dev "${bootif_dev}"
-                ip link set "${bootif_dev}" down
-            fi
-        elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
-            cp /etc/resolv.conf /new_root/etc/resolv.conf
-        fi
-    fi
-}

initcpio/hooks/artix_pxe_http

@@ -1,63 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${artix_http_srv}" ]]; then
-
-        # booting with http is always copy-to-ram, so set here to make sure
-        # addresses are flushed and interface is set down
-        copytoram="y"
-
-        artix_http_srv=$(eval echo ${artix_http_srv})
-        [[ -z "${artix_http_spc}" ]] && artix_http_spc="75%"
-
-        mount_handler="artix_pxe_http_mount_handler"
-    fi
-}
-
-# Fetch a file with CURL
-#
-# $1 URL
-# $2 Destination directory inside httpspace/${root}
-_curl_get() {
-    local _url="${1}"
-    local _dst="${2}"
-
-    msg ":: Downloading '${_url}'"
-    if ! curl -L -f -o "${live_root}/httpspace/${root}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
-        echo "ERROR: Downloading '${_url}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-_get_sfs() {
-    local _sfs="${2}"
-    local _src=${artix_http_srv}${root}
-    if [[ ! -z "$( curl -s --head "${_src}/${_sfs}.img" | grep "OK" )" ]]; then
-        _curl_get "${_src}/${_sfs}.img" "/"
-
-        if [[ "${checksum}" == "y" ]]; then
-            _curl_get "${_src}/${_sfs}.md5" "/"
-        fi
-        if [[ "${verify}" == "y" ]]; then
-            _curl_get "${_src}/${_sfs}.img.sig" "/"
-        fi
-    fi
-}
-
-artix_pxe_http_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Mounting ${live_root}/httpspace (tmpfs) filesystem, size='${artix_http_spc}'"
-    mkdir -p "${live_root}/httpspace"
-    mount -t tmpfs -o size="${artix_http_spc}",mode=0755 httpspace "${live_root}/httpspace"
-
-    _get_sfs "rootfs"
-    [[ -n "${overlay}" ]] && _mount_root_overlayfs "${overlay}"
-
-    mkdir -p "${bootmnt}"
-    mount -o bind ${live_root}/httpspace ${bootmnt}
-
-    artix_mount_handler ${newroot}
-}

initcpio/hooks/artix_pxe_nbd

@@ -1,47 +0,0 @@
-# vim: set ft=sh:
-
-run_earlyhook() {
-    if [[ -n "${ip}" && -n "${artix_nbd_srv}" ]]; then
-        # Module autoloading like with loop devices does not work, doing manually...
-        modprobe nbd 2> /dev/null
-    fi
-}
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${artix_nbd_srv}" ]]; then
-
-        artix_nbd_srv=$(eval echo ${artix_nbd_srv})
-        [[ -z "${artix_nbd_name}" ]] && artix_nbd_name="artix"
-
-        mount_handler="artix_pxe_nbd_mount_handler"
-    fi
-}
-
-artix_pxe_nbd_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Waiting for boot device..."
-    while ! poll_device /dev/nbd0 30; do
-        echo "ERROR: boot device didn't show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    msg ":: Setup NBD from ${artix_nbd_srv} at /dev/nbd0"
-    if [[ "${copytoram}" != "n" ]]; then
-        nbd-client ${artix_nbd_srv} -N ${artix_nbd_name} /dev/nbd0
-        copytoram="y"
-    else
-        nbd-client ${artix_nbd_srv} -N ${artix_nbd_name} -persist /dev/nbd0
-    fi
-
-    artixdevice=/dev/nbd0
-
-    artix_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Disconnect NBD from ${artix_nbd_srv} at /dev/nbd0"
-        nbd-client -d /dev/nbd0
-    fi
-}

initcpio/hooks/artix_pxe_nfs

@@ -1,30 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${artix_nfs_srv}" ]]; then
-
-        artix_nfs_srv=$(eval echo ${artix_nfs_srv})
-        [[ -n "${artix_nfs_opt}" ]] && artix_nfs_opt="-o ${artix_nfs_opt}"
-
-        mount_handler="artix_nfs_mount_handler"
-    fi
-}
-
-artix_nfs_mount_handler() {
-    newroot="${1}"
-    mkdir -p "${bootmnt}"
-    msg ":: Mounting '${artix_nfs_srv}'"
-    # Do not put "${artix_nfs_opt}" nfsmount fails!
-    if ! nfsmount ${artix_nfs_opt} "${artix_nfs_srv}" "${bootmnt}"; then
-        echo "ERROR: Mounting '${artix_nfs_srv}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-
-    if [[ "${copytoram}" != "n" ]]; then
-        copytoram="y"
-    fi
-
-    artix_mount_handler ${newroot}
-}

initcpio/hooks/artix_shutdown

@@ -1,6 +0,0 @@
-run_cleanuphook() {
-    rm -rf /usr/lib/modules
-    cp -ax / /run/initramfs
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "cdrom"
-    add_module "loop"
-    add_module "dm-snapshot"
-    add_module "overlay"
-
-    add_runscript
-
-    add_binary /usr/lib/udev/cdrom_id
-    add_binary blockdev
-    add_binary dmsetup
-    add_binary losetup
-    add_binary mountpoint
-    add_binary truncate
-    add_binary gpg
-    add_binary grep
-
-    add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
-    add_file /usr/lib/udev/rules.d/10-dm.rules
-    add_file /usr/lib/udev/rules.d/95-dm-notify.rules
-    add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    if [[ $ARTIX_GNUPG_FD ]]; then
-        mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$ARTIX_GNUPG_FD
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_kms

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "radeon"
-    add_module "nouveau"
-    add_module "i915"
-    add_module "via-agp"
-    add_module "sis-agp"
-    add_module "intel-agp"
-}
-
-help() {
-    cat << HELPEOF
-Adds all common KMS drivers to the initramfs image.
-HELPEOF
-}

initcpio/install/artix_loop_mnt

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via loop device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_pxe_common

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig
-
-    # Add hosts support files+dns
-    add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_files.so.2)
-    add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_dns.so.2)
-
-    add_dir /etc
-    echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_pxe_http

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-
-    add_binary curl
-
-    add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and HTTP.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_pxe_nbd

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nbd"
-
-    add_runscript
-
-    add_binary nbd-client
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NBD.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_pxe_nfs

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nfs"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount
-}
-
-help() {
-    cat <<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NFS.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/artix_shutdown

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary cp
-
-    add_runscript
-
-    add_file /etc/initcpio/artix_shutdown /shutdown
-}
-
-help() {
-    cat <<HELPEOF
-This hook will create a shutdown initramfs in /run/initramfs
-that we can pivot to on shutdown in order to unmount / and
-and others mount points, dm-snapshot devices and loopback devices.
-Mostly usefull for dm-snapshot persistent.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/script/artix_shutdown

@@ -1,37 +0,0 @@
-#!/bin/ash
-
-# /oldroot depends on things inside /oldroot/run/artix...
-mkdir /oldrun
-mount -n --move /oldroot/run /oldrun
-
-# Unmount all mounts now.
-umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)
-
-# Remove all dm-snapshot devices.
-dmsetup remove_all
-
-# Remove all loopback devices.
-for _lup in $(grep ^/dev/loop /oldrun/artix/used_block_devices | tac); do
-    if ! losetup -d ${_lup} 2> /dev/null; then
-        umount -d ${_lup}
-    fi
-done
-
-# Unmount the space used to store *.cow.
-umount /oldrun/artix/cowspace
-
-# Unmount boot device if needed (no copytoram=y used)
-if [[ ! -d /oldrun/artix/copytoram ]]; then
-    if [[ -d /oldrun/artix/img_dev ]]; then
-        umount /oldrun/artix/img_dev
-    else
-        umount /oldrun/bootmnt
-    fi
-fi
-
-# reboot / poweroff / halt, depending on the argument passed by init
-# if something invalid is passed, we halt
-case "$1" in
-  reboot|poweroff|halt) "$1" -f ;;
-  *) halt -f;;
-esac

lib/base/common.sh

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

lib/base/mount.sh

@@ -1,84 +0,0 @@
-#!/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() {
-#     info "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
-#         info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-        umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    fi
-    unset CHROOT_ACTIVE_MOUNTS
-}
-
-#}}}

lib/iso/calamares.sh

@@ -1,98 +0,0 @@
-#!/hint/bash
-
-#{{{ calamares
-
-write_users_conf(){
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'defaultGroups')
-    local IFS=','
-    for g in "${ADDGROUPS[@]}"; do
-        yaml+=$(write_yaml_seq 2 "$g")
-    done
-    unset IFS
-    yaml+=$(write_yaml_map 0 'autologinGroup' 'autologin')
-    yaml+=$(write_yaml_map 0 'doAutologin' 'false')
-    yaml+=$(write_yaml_map 0 'sudoersGroup' 'wheel')
-    yaml+=$(write_yaml_map 0 'setRootPassword' 'true')
-    yaml+=$(write_yaml_map 0 'availableShells' '/bin/bash, /bin/zsh')
-#     yaml+=$(write_yaml_map 0 'passwordRequirements')
-#     yaml+=$(write_yaml_map 2 'minLength' '-1')
-#     yaml+=$(write_yaml_map 2 'maxLength' '-1')
-#     yaml+=$(write_yaml_map 2 'libpwquality')
-#     yaml+=$(write_yaml_seq 4 "minlen=8")
-#     yaml+=$(write_yaml_seq 4 "minclass=80")
-    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
-}
-
-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' "${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"
-}
-
-write_postcfg(){
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'keyrings')
-    for k in archlinux artix;do
-        yaml+=$(write_yaml_seq 2 "$k")
-    done
-    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
-}
-
-write_unpackfs() {
-    local yaml
-    yaml=$(write_yaml_header)
-    yaml+=$(write_yaml_map 0 'unpack')
-#     if ${persist}; then
-#         yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-#         yaml+=$(write_yaml_map 4 'sourcefs' '"ext4"')
-#     else
-    yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-    yaml+=$(write_yaml_map 4 'sourcefs' '"squashfs"')
-#     fi
-    yaml+=$(write_yaml_map 4 'destination' '""')
-    yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
-}
-
-configure_calamares(){
-    local mods="$1/etc/calamares/modules"
-    if [[ -d "$mods" ]];then
-        msg2 "Configuring Calamares"
-        write_users_conf > "$mods"/users.conf
-        write_services_"${INITSYS}"_conf "$mods"
-        write_postcfg > "$mods"/postcfg.conf
-        write_unpackfs > "$mods"/unpackfs.conf
-        sed -e "s|services-openrc|services-${INITSYS}|" \
-            -i "$1"/etc/calamares/settings.conf
-    fi
-}
-
-#}}}

lib/iso/config.sh

@@ -1,55 +0,0 @@
-#!/hint/bash
-
-#{{{ session
-
-configure_hosts(){
-    sed -e "s|localhost.localdomain|localhost.localdomain ${HOST_NAME}|" -i "$1"/etc/hosts
-}
-
-configure_logind(){
-    local conf=$1/etc/"$2"/logind.conf
-    if [[ -e "$conf" ]];then
-        msg2 "Configuring logind ..."
-        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
-    fi
-}
-
-configure_services(){
-    local mnt="$1"
-    info "Configuring [%s] services" "${INITSYS}"
-    add_svc_"${INITSYS}" "$mnt" "${SERVICES[*]} ${SERVICES_LIVE[*]}"
-    info "Done configuring [%s] services" "${INITSYS}"
-}
-
-configure_system(){
-    local mnt="$1"
-    configure_logind "$mnt" "elogind"
-    echo "${HOST_NAME}" > "$mnt"/etc/hostname
-}
-
-write_live_session_conf(){
-    local conf=''
-    conf+=$(printf '%s\n' '# live session configuration')
-    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
-    conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
-    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
-    conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
-    printf '%s' "$conf"
-}
-
-configure_chroot(){
-    local fs="$1"
-    msg "Configuring [%s]" "${fs##*/}"
-    configure_hosts "$fs"
-    configure_system "$fs"
-    configure_services "$fs"
-    configure_calamares "$fs"
-    [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
-    msg2 "Writing live.conf"
-    write_live_session_conf > "$fs/etc/artools/live.conf"
-    msg "Done configuring [%s]" "${fs##*/}"
-}
-
-#}}}

lib/iso/initcpio.sh

@@ -1,57 +0,0 @@
-#!/hint/bash
-
-#{{{ initcpio
-
-write_mkinitcpio_conf() {
-    msg2 "Writing mkinitcpio.conf ..."
-    local conf="$1/etc/mkinitcpio-artix.conf"
-    printf "%s\n" 'MODULES=(loop dm-snapshot)' > "$conf"
-    printf "%s\n" 'COMPRESSION="xz"' >> "$conf"
-    if [[ "${profile}" == 'base' ]];then
-        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
-                            artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs
-                            artix_kms modconf block filesystems keyboard keymap)' >> "$conf"
-    else
-        printf "%s\n" 'HOOKS=(base udev artix_shutdown artix artix_loop_mnt
-                            artix_kms modconf block filesystems keyboard keymap)' >> "$conf"
-    fi
-}
-
-prepare_initcpio(){
-    msg2 "Copying initcpio ..."
-    local dest="$1"
-    cp /etc/initcpio/hooks/artix* "$dest"/etc/initcpio/hooks
-    cp /etc/initcpio/install/artix* "$dest"/etc/initcpio/install
-    cp /etc/initcpio/artix_shutdown "$dest"/etc/initcpio
-}
-
-prepare_initramfs(){
-    local mnt="$1"
-
-    prepare_initcpio "$mnt"
-
-    write_mkinitcpio_conf "$mnt"
-
-    if [[ -n ${GPG_KEY} ]]; then
-        su "${owner}" -c "gpg --export ${GPG_KEY} >/tmp/GPG_KEY"
-        exec 17<>/tmp/GPG_KEY
-    fi
-    local _kernel
-     _kernel=$(<"$mnt"/usr/src/linux/version)
-    ARTIX_GNUPG_FD=${GPG_KEY:+17} artools-chroot "$mnt" \
-        /usr/bin/mkinitcpio -k "${_kernel}" \
-        -c /etc/mkinitcpio-artix.conf \
-        -g /boot/initramfs.img
-
-    if [[ -n "${GPG_KEY}" ]]; then
-        exec 17<&-
-    fi
-    if [[ -f /tmp/GPG_KEY ]]; then
-        rm /tmp/GPG_KEY
-    fi
-
-    cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img
-    prepare_boot_extras "$mnt"
-}
-
-#}}}

lib/iso/profile.sh

@@ -1,84 +0,0 @@
-#!/hint/bash
-
-#{{{ profile
-
-show_profile(){
-    msg2 "iso_file: %s" "${iso_file}"
-    msg2 "AUTOLOGIN: %s" "${AUTOLOGIN}"
-    msg2 "HOST_NAME: %s" "${HOST_NAME}"
-    msg2 "USER_NAME: %s" "${USER_NAME}"
-    msg2 "PASSWORD: %s" "${PASSWORD}"
-    msg2 "ADDGROUPS: %s" "${ADDGROUPS}"
-    msg2 "SERVICES_LIVE: %s" "${SERVICES_LIVE[*]}"
-    msg2 "SERVICES: %s" "${SERVICES[*]}"
-}
-
-load_profile(){
-    local profile_dir="${DATADIR}/iso-profiles"
-    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profile_dir=${WORKSPACE_DIR}/iso-profiles
-
-    ROOT_LIST="$profile_dir/${profile}/Packages-Root"
-    ROOT_OVERLAY="$profile_dir/${profile}/root-overlay"
-
-    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && LIVE_LIST="$profile_dir/${profile}/Packages-Live"
-    [[ -d "$profile_dir/${profile}/live-overlay" ]] && LIVE_OVERLAY="$profile_dir/${profile}/live-overlay"
-
-    [[ -f $profile_dir/${profile}/profile.conf ]] || return 1
-
-    # shellcheck disable=1090
-    [[ -r "$profile_dir/${profile}"/profile.conf ]] && . "$profile_dir/${profile}"/profile.conf
-
-    DISPLAYMANAGER=${DISPLAYMANAGER:-'none'}
-
-    AUTOLOGIN=${AUTOLOGIN:-"true"}
-    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"
-
-    HOST_NAME=${HOST_NAME:-'artix'}
-
-    USER_NAME=${USER_NAME:-'artix'}
-
-    PASSWORD=${PASSWORD:-'artix'}
-
-    ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
-
-    if [[ -z "${SERVICES[*]}" ]];then
-        SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
-    fi
-
-    if [[ ${DISPLAYMANAGER} != "none" ]];then
-        case "${INITSYS}" in
-            'openrc') SERVICES+=('xdm') ;;
-            'runit'|'s6') SERVICES+=("${DISPLAYMANAGER}") ;;
-        esac
-    fi
-
-    SERVICES_LIVE=('artix-live' 'pacman-init')
-
-    return 0
-}
-
-load_pkgs(){
-    local pkglist="$1" init="$2"
-    info "Loading Packages: [%s] ..." "${pkglist##*/}"
-
-    local _init="s|@$init||g"
-    case "$init" in
-        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6.*||g" ;;
-        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
-        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
-    esac
-
-    local _space="s| ||g" \
-        _clean=':a;N;$!ba;s/\n/ /g' \
-        _com_rm="s|#.*||g"
-
-    packages=($(sed "$_com_rm" "$pkglist" \
-            | sed "$_space" \
-            | sed "$_purge" \
-            | sed "$_init" \
-            | sed "$_init_rm1" \
-            | sed "$_init_rm2" \
-            | sed "$_clean"))
-}
-
-#}}}

lib/iso/services.sh

@@ -1,52 +0,0 @@
-#!/hint/bash
-
-#{{{ services
-
-set_xdm(){
-    if [[ -f "$1"/etc/conf.d/xdm ]];then
-        local conf='DISPLAYMANAGER="'${DISPLAYMANAGER}'"'
-        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" "$1"/etc/conf.d/xdm
-    fi
-}
-
-add_svc_openrc(){
-    local mnt="$1" names="$2" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -f $mnt/etc/init.d/$svc ]];then
-            msg2 "Setting %s ..." "$svc"
-            [[ $svc == "xdm" ]] && set_xdm "$mnt"
-            chroot "$mnt" rc-update add "$svc" "$rlvl" &>/dev/null
-        fi
-    done
-}
-
-add_svc_runit(){
-    local mnt="$1" names="$2" rlvl="${3:-default}"
-    for svc in $names; do
-        if [[ -d $mnt/etc/runit/sv/$svc ]]; then
-            msg2 "Setting %s ..." "$svc"
-            chroot "$mnt" ln -s /etc/runit/sv/"$svc" /etc/runit/runsvdir/"$rlvl" &>/dev/null
-        fi
-    done
-}
-
-add_svc_s6(){
-    local mnt="$1" names="$2" rlvl="${3:-default}" error ret
-    for svc in $names; do
-        error=false
-        chroot "$mnt" s6-rc-db -c /etc/s6/rc/compiled type "$svc" &> /dev/null || error=true
-        ret="$?"
-        if [ $ret -eq 0 ] && [[ "$error" == false ]]; then
-            msg2 "Setting %s ..." "$svc"
-            chroot "$mnt" s6-rc-bundle-update -c /etc/s6/rc/compiled add "$rlvl" "$svc"
-        fi
-    done
-
-    # rebuild s6-linux-init binaries
-    chroot "$mnt" rm -r /etc/s6/current
-    chroot "$mnt" s6-linux-init-maker -1 -N -f /etc/s6/skel -G "/usr/bin/agetty -L -8 tty1 115200" -c /etc/s6/current /etc/s6/current
-    chroot "$mnt" mv /etc/s6/current/bin/init /etc/s6/current/bin/s6-init
-    chroot "$mnt" cp -a /etc/s6/current/bin /usr
-}
-
-#}}}

lib/pkg/git.sh

@@ -1,80 +0,0 @@
-#!/hint/bash
-
-#{{{ git
-
-get_pkg_org(){
-    local pkg="$1" org sub
-    case ${pkg} in
-        ruby-*) org="packagesRuby" ;;
-        perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
-        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
-    esac
-    echo "$org"
-}
-
-get_team_id() {
-    local org="$1" team="$2"
-    local id
-    id=$(curl -s -X GET "${GIT_URL}/api/v1/orgs/$org/teams/search?q=$team&access_token=${GIT_TOKEN}" \
-        -H  "accept: application/json" | jq '.data[] .id')
-    echo "$id"
-}
-
-add_repo_to_team() {
-    local pkg="$1" org="$2" team="$3"
-    local id
-    id=$(get_team_id "$org" "$team")
-    local gitname
-    gitname=$(get_compliant_name "$pkg")
-
-    msg2 "Adding package repo [%s] to team (%s)" "$gitname" "$team"
-
-    curl -s -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
-        -H  "accept: application/json"
-}
-
-remove_repo_from_team() {
-    local pkg="$1" org="$2" team="$3"
-    local id
-    id=$(get_team_id "$org" "$team")
-    local gitname
-    gitname=$(get_compliant_name "$pkg")
-
-    msg2 "Removing package repo [%s] from team (%s)" "$gitname" "$team"
-
-    curl -s -X DELETE "${GIT_URL}/api/v1/teams/$id/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
-        -H  "accept: application/json"
-}
-
-get_local_head(){
-    git log --pretty=%H ...refs/heads/master^ | head -n 1
-}
-
-get_remote_head(){
-    git ls-remote origin -h refs/heads/master | cut -f1
-}
-
-has_changeset(){
-    local head_l="$1" head_r="$2"
-    if [[ "$head_l" == "$head_r" ]]; then
-        msg2 "remote changes: no"
-        return 1
-    else
-        msg2 "remote changes: yes"
-        return 0
-    fi
-}
-
-pull_tree(){
-    local tree="$1" local_head="$2" os="${3:-Artix}"
-    local remote_head
-    remote_head=$(get_remote_head)
-
-    msg "Checking (%s) (%s)" "${tree}" "$os"
-    if has_changeset "${local_head}" "${remote_head}";then
-        git pull origin master
-    fi
-}
-
-#}}}

lib/pkg/jenkins.sh

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

lib/pkg/repo.sh

@@ -1,36 +0,0 @@
-#!/hint/bash
-
-##{{{ repo
-
-shopt -s extglob
-
-set_arch_repos(){
-    local x="$1" y="$2" z="$3"
-    # shellcheck disable=1090
-    . "${DATADIR}"/valid-names.conf
-
-    ARCH_REPOS=("${stable[@]}")
-
-    $x && ARCH_REPOS+=("${gremlins[@]}")
-    $y && ARCH_REPOS+=("${goblins[@]}")
-    $z && ARCH_REPOS+=("${unstable[@]}")
-}
-
-find_repo(){
-    local pkg="$1" repo pkgarch="${2:-${CARCH}}"
-    for r in "${ARCH_REPOS[@]}"; do
-        [[ -f $pkg/repos/$r-$pkgarch/PKGBUILD ]] && repo=repos/"$r-$pkgarch"
-        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
-        [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
-    done
-    echo "$repo"
-}
-
-find_pkg(){
-    local searchdir="$1" pkg="$2"
-    local result
-    result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    echo "$result"
-}
-
-#}}}

lib/util-base.sh

@@ -1,41 +0,0 @@
-#!/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 disable=1090
-    [[ -r "$conf" ]] && . "$conf"
-
-    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
-
-    WORKSPACE_DIR=${WORKSPACE_DIR:-"/home/${USER}/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,29 +0,0 @@
-#!/hint/bash
-
-#{{{ iso conf
-
-load_iso_config(){
-
-    local conf="$1/artools-iso.conf"
-
-    [[ -f "$conf" ]] || return 1
-
-    # shellcheck disable=1090
-    [[ -r "$conf" ]] && . "$conf"
-
-    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
-
-    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
-
-    INITSYS=${INITSYS:-'openrc'}
-
-    GPG_KEY=${GPG_KEY:-''}
-
-    return 0
-}
-
-#}}}
-
-load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"
-
-prepare_dir "${ISO_POOL}"

lib/util-pkg.sh

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

src/base/artix-chroot.in

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

@@ -0,0 +1,149 @@
+#!/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/base/fstabgen.in

@@ -1,28 +1,23 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 shopt -s extglob
 
-m4_include(lib/base/message.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
 
 #{{{ filesystems
 
 declare -A pseudofs_types=([anon_inodefs]=1
+                        [apparmorfs]=1
                         [autofs]=1
                         [bdev]=1
-                        [bpf]=1
+                        [binder]=1
                         [binfmt_misc]=1
+                        [bpf]=1
                         [cgroup]=1
                         [cgroup2]=1
                         [configfs]=1
@@ -32,31 +27,55 @@ 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=([cramfs]=1
+declare -A fsck_types=([btrfs]=0    # btrfs doesn't need a regular fsck utility
+                    [cramfs]=1
+                    [erofs]=1
                     [exfat]=1
                     [ext2]=1
                     [ext3]=1
                     [ext4]=1
-                    [ext4dev]=1
+                    [f2fs]=1
+                    [fat]=1
                     [jfs]=1
                     [minix]=1
                     [msdos]=1
@@ -76,11 +95,15 @@ 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
-        { _=$(( $base#${2:i:1} )) || return 1; } 2>/dev/null
+        try_cast "$base" "${2:i:1}" || return 1
     done
 
     return 0
@@ -88,7 +111,6 @@ valid_number_of_base() {
 
 mangle() {
     local i chr out
-
     local {a..f}= {A..F}=
 
     for (( i = 0; i < ${#1}; i++ )); do
@@ -107,7 +129,6 @@ mangle() {
 
 unmangle() {
     local i chr out len=$(( ${#1} - 4 ))
-
     local {a..f}= {A..F}=
 
     for (( i = 0; i < len; i++ )); do
@@ -134,7 +155,6 @@ 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
 }
@@ -192,19 +212,11 @@ optstring_append_option() {
     optstring_normalize "$1"
 }
 
-optstring_prepend_option() {
-    if ! optstring_has_option "$1" "$2"; then
-        declare -g "$1=$2,${!1}"
-    fi
-
-    optstring_normalize "$1"
-}
-
 optstring_get_option() {
-    local opts o
+    local _opts o
 
-    IFS=, read -ra opts <<<"${!1}"
-    for o in "${opts[@]}"; do
+    IFS=, read -ra _opts <<<"${!1}"
+    for o in "${_opts[@]}"; do
         if optstring_match_option "$2" "$o"; then
             declare -g "$o"
             return 0
@@ -221,7 +233,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)
@@ -249,7 +261,7 @@ write_source() {
         ;;
     esac
 
-    [[ -n "${comment[*]}" ]] && printf '# %s\n' "${comment[*]}"
+    [[ -n ${comment[*]} ]] && printf '# %s\n' "${comment[*]}"
 
     if [[ $spec ]]; then
         printf '%-20s' "$bytag=$(mangle "$spec")"
@@ -274,15 +286,27 @@ 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 Kconfig options for f2fs. Kernels supporting the options will
-            # only provide the negative versions of these (e.g. noacl), and vice versa
+            # These are build-time or runtime-unchangeable options for f2fs.
+            # The former means that kernels supporting the options will only
+            # provide the negative versions of these (e.g. noacl), and vice versa
             # for kernels without support.
-            optstring_remove_option "$varname" noacl,acl,nouser_xattr,user_xattr
+            # The latter means that the options can only be specified/changed
+            # 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.
-            if optstring_get_option "$varname" codepage && [[ "$codepage" = cp* ]]; then
+            # shellcheck disable=SC2154
+            if optstring_get_option "$varname" codepage && [[ $codepage = cp* ]]; then
                 optstring_remove_option "$varname" codepage
                 optstring_append_option "$varname" "codepage=${codepage#cp}"
             fi
@@ -297,11 +321,12 @@ 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 printing mounts
-    -t TAG         Use TAG for source identifiers
+    -P             Include pseudofs mounts
+    -t <tag>       Use TAG for source identifiers (TAG should be one of: LABEL,
+                      UUID, PARTLABEL, PARTUUID)
     -U             Use UUIDs for source identifiers (shortcut for -t UUID)
 
     -h             Print this help message
@@ -339,7 +364,6 @@ 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
@@ -352,7 +376,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...
@@ -364,36 +388,33 @@ while read -r src target fstype opts fsroot; do
         pass=0
     fi
 
-    if [[ $fsroot != / ]]; then
-        if [[ $fstype = btrfs ]]; then
-            opts+=,subvol=${fsroot#/}
-        else
-            # it's a bind mount
-            src=$(findmnt -funcevo TARGET "$src")$fsroot
-            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,
-                # because this won't actually be a valid mount. Worst case, the user
-                # just re-adds it.
-                continue
-            fi
-            fstype=none
-            opts+=,bind
-            pass=0
+    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,
+            # because this won't actually be a valid mount. Worst case, the user
+            # just re-adds it.
+            continue
         fi
+        fstype=none
+        opts+=,bind
+        pass=0
     fi
 
     # filesystem quirks
     case $fstype in
         fuseblk)
-        # well-behaved FUSE filesystems will report themselves as fuse.$fstype.
-        # this is probably NTFS-3g, but let's just make sure.
-        if ! newtype=$(lsblk -no FSTYPE "$src") || [[ -z $newtype ]]; then
-            # avoid blanking out fstype, leading to an invalid fstab
-            error 'Failed to derive real filesystem type for FUSE device on %s' "$target"
-        else
-            fstype=$newtype
-        fi
+            # well-behaved FUSE filesystems will report themselves as fuse.$fstype.
+            # this is probably NTFS-3g, but let's just make sure.
+            if ! newtype=$(lsblk -no FSTYPE "$src") || [[ -z $newtype ]]; then
+                # avoid blanking out fstype, leading to an invalid fstab
+                error 'Failed to derive real filesystem type for FUSE device on %s' "$target"
+            else
+                fstype=$newtype
+            fi
         ;;
     esac
 
@@ -404,7 +425,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
+done < <(findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root")
 
 # handle swaps devices
 {
@@ -420,8 +441,11 @@ done
         # 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

src/iso/buildiso.in

@@ -1,35 +1,41 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
-# Copyright (C) 2018 Artix Linux Developers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-m4_include(lib/util-base.sh)
-m4_include(lib/util-iso.sh)
-m4_include(lib/base/message.sh)
-m4_include(lib/base/common.sh)
-m4_include(lib/base/chroot.sh)
-m4_include(lib/iso/mount.sh)
-m4_include(lib/iso/services.sh)
-m4_include(lib/base/yaml.sh)
-m4_include(lib/iso/calamares.sh)
-m4_include(lib/iso/config.sh)
-m4_include(lib/iso/firmware.sh)
-m4_include(lib/iso/dracut.sh)
-m4_include(lib/iso/initcpio.sh)
-m4_include(lib/iso/grub.sh)
-m4_include(lib/iso/squash.sh)
-m4_include(lib/iso/iso.sh)
-m4_include(lib/iso/profile.sh)
-m4_include(lib/iso/trap.sh)
+LIBDIR=${LIBDIR:-'@libdir@'}
+DATADIR=${DATADIR:-'@datadir@'}
+SYSCONFDIR=${SYSCONFDIR:-'@sysconfdir@/artools'}
+
+# shellcheck source=src/lib/iso/util.sh
+source "${LIBDIR}"/iso/util.sh
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
+# shellcheck source=src/lib/base/chroot.sh
+source "${LIBDIR}"/base/chroot.sh
+# shellcheck source=src/lib/iso/mount.sh
+source "${LIBDIR}"/iso/mount.sh
+# shellcheck source=src/lib/iso/services.sh
+source "${LIBDIR}"/iso/services.sh
+# shellcheck source=src/lib/iso/calamares.sh
+source "${LIBDIR}"/iso/calamares.sh
+# shellcheck source=src/lib/iso/config.sh
+source "${LIBDIR}"/iso/config.sh
+# shellcheck source=src/lib/iso/firmware.sh
+source "${LIBDIR}"/iso/firmware.sh
+# shellcheck source=src/lib/iso/dracut.sh
+source "${LIBDIR}"/iso/dracut.sh
+# shellcheck source=src/lib/iso/initcpio.sh
+source "${LIBDIR}"/iso/initcpio.sh
+# shellcheck source=src/lib/iso/grub.sh
+source "${LIBDIR}"/iso/grub.sh
+# shellcheck source=src/lib/iso/squash.sh
+source "${LIBDIR}"/iso/squash.sh
+# shellcheck source=src/lib/iso/iso.sh
+source "${LIBDIR}"/iso/iso.sh
+# shellcheck source=src/lib/iso/profile.sh
+source "${LIBDIR}"/iso/profile.sh
+# shellcheck source=src/lib/iso/trap.sh
+source "${LIBDIR}"/iso/trap.sh
 
 clean_up_chroot(){
     local path mnt="$1"
@@ -60,7 +66,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
@@ -82,13 +88,15 @@ make_rootfs() {
         msg "Prepare [Base installation] (rootfs)"
         local rootfs="${work_dir}/rootfs"
 
+        load_pkgs "${root_list}"
+
         prepare_dir "${rootfs}"
 
         basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
 
-        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
+        copy_overlay "${root_overlay}" "${rootfs}"
 
-        [[ -z ${LIVE_LIST} ]] && configure_chroot "${rootfs}"
+        [[ -z ${live_list} ]] && configure_chroot "${rootfs}"
 
         clean_up_chroot "${rootfs}"
 
@@ -103,13 +111,15 @@ make_livefs() {
         msg "Prepare [Live installation] (livefs)"
         local livefs="${work_dir}/livefs"
 
+        load_pkgs "${live_list}"
+
         prepare_dir "${livefs}"
 
         mount_overlayfs "${livefs}" "${work_dir}"
 
         basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"
 
-        copy_overlay "${LIVE_OVERLAY}" "${livefs}"
+        copy_overlay "${live_overlay}" "${livefs}"
 
         configure_chroot "${livefs}"
 
@@ -127,6 +137,8 @@ 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}"
@@ -138,7 +150,8 @@ make_bootfs() {
         if "${use_dracut}"; then
             prepare_initramfs_dracut "${bootfs}"
         else
-            prepare_initramfs "${bootfs}"
+            basestrap "${basestrap_args[@]}" "${bootfs}" "${packages[@]}"
+            prepare_initramfs_mkinitcpio "${bootfs}"
         fi
 
         umount_overlayfs
@@ -154,14 +167,14 @@ make_grub(){
         msg "Prepare [/iso/boot/grub]"
 
         local layer=${work_dir}/rootfs
-        [[ -n ${LIVE_LIST} ]] && layer=${work_dir}/livefs
+        [[ -n ${live_list} ]] && layer=${work_dir}/livefs
 
         prepare_grub "${work_dir}/rootfs" "$layer"
 
         if ${use_dracut}; then
             configure_grub_dracut
         else
-            configure_grub
+            configure_grub_mkinitcpio
         fi
 
         : > "${work_dir}"/grub.lock
@@ -174,26 +187,23 @@ gen_iso_fn(){
     vars+=("${profile}")
     vars+=("${INITSYS}")
     case "${repo}" in
-        'gremlins'|'goblins') vars+=("${repo}") ;;
+        *-gremlins|*-goblins) vars+=("${repo#*-}") ;;
     esac
     vars+=("${ISO_VERSION}")
     vars+=("${arch}")
     for n in "${vars[@]}"; do
         name=${name:-}${name:+-}${n}
     done
-    echo "$name"
+    printf "%s\n" "$name"
 }
 
 prepare_build(){
     load_profile
 
-    local repo=default
-
-    case "${repo}" in
-        'gremlins'|'goblins') repo="${repo}" ;;
-    esac
-
-    get_pacman_conf "${repo}"
+    pacman_conf="${DATADIR}/pacman.conf.d/${repo}-${arch}.conf"
+    if [[ -f "${USER_CONF_DIR}/pacman.conf.d/${repo}-${arch}.conf" ]]; then
+        pacman_conf="${USER_CONF_DIR}/pacman.conf.d/${repo}-${arch}.conf"
+    fi
 
     iso_file=$(gen_iso_fn).iso
 
@@ -208,6 +218,10 @@ prepare_build(){
     live_dir=/LiveOS
 
     mnt_dir=${chroots_iso}/${profile}/mnt
+
+    if [[ -n "${GPG_KEY}" ]]; then
+        ${use_dracut} || export_gpg_publickey
+    fi
 }
 
 display_settings(){
@@ -218,6 +232,8 @@ display_settings(){
 
     msg "ISO SETTINGS:"
     msg2 "ISO_VERSION: %s" "${ISO_VERSION}"
+    msg2 "COMPRESSION: %s" "${COMPRESSION}"
+    [[ "${COMPRESSION}" == 'zstd' ]] && msg2 "COMPRESSION_LEVEL: %s" "${COMPRESSION_LEVEL}"
 
     msg "BUILD:"
     show_profile
@@ -237,7 +253,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}"
@@ -249,10 +265,8 @@ mk_boot(){
 }
 
 mk_chroots(){
-    load_pkgs "${ROOT_LIST}" "${INITSYS}"
     run_safe "make_rootfs"
-    if [[ -n ${LIVE_LIST} ]]; then
-        load_pkgs "${LIVE_LIST}" "${INITSYS}"
+    if [[ -n ${live_list} ]]; then
         run_safe "make_livefs"
     fi
 }
@@ -313,43 +327,51 @@ boot_only=false
 basestrap_args=(-GMc)
 cmd=${0##*/}
 
-repo=${cmd##*-}
+repo=${REPO}
 owner=${SUDO_USER:-$USER}
 profile='base'
 chroots_iso="${CHROOTS_DIR}/buildiso"
-arch=$(uname -m)
+arch=${ARCH}
 
 usage() {
-    echo "Usage: ${cmd} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
-    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
-    echo '    -t <dir>           Target directory'
-    echo "                       [default: ${ISO_POOL}]"
-    echo '    -i <name>          Init system to use'
-    echo "                       [default: ${INITSYS}]"
-    echo '    -g <key>           The gpg key for img signing'
-    echo "                       [default: ${GPG_KEY}]"
-    echo '    -m                 Set SquashFS image mode to persistence'
-    echo '    -c                 Disable clean work dir'
-    echo '    -x                 Build chroot only'
-    echo '    -s                 Squash chroot only'
-    echo '    -b                 Generate iso boot only'
-    echo '    -z                 Generate iso only'
-    echo '                       Requires pre built images (-x)'
-    echo '    -d                 Use dracut instead of mkinitcpio for iso initramfs'
-    echo '    -q                 Query settings and pretend build'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
+    printf 'Usage: %s [options]\n' "${cmd}"
+    printf '    -p <profile>       Profile [default: %s]\n' "${profile}"
+    printf '    -r <dir>           Chroots directory\n'
+    printf '                       [default: %s]\n' "${chroots_iso}"
+    printf '    -R <repo>          Build repo\n'
+    printf '                       [default: %s]\n' "${repo}"
+    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'
+    printf '                       [default: %s]\n' "${INITSYS}"
+    printf '    -g <key>           The gpg key for img signing\n'
+    printf '                       [default: none]\n'
+    printf '    -m                 Set SquashFS image mode to persistence\n'
+    printf '    -c                 Disable clean work dir\n'
+    printf '    -x                 Build chroot only\n'
+    printf '    -s                 Squash chroot only\n'
+    printf '    -b                 Generate iso boot only\n'
+    printf '    -z                 Generate iso only\n'
+    printf '                       Requires pre built images (-x)\n'
+    printf '    -d                 Use dracut instead of mkinitcpio for iso initramfs\n'
+    printf '    -q                 Query settings and pretend build\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
     exit "$1"
 }
 
-opts='p:r:t:i:g:czsbxmdqh'
+orig_args=("$@")
+
+opts='p:r:R:t:i:g:a:czsbxmdqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) profile="$OPTARG" ;;
+        a) arch="$OPTARG" ;;
+        R) repo="$OPTARG" ;;
         r) chroots_iso="$OPTARG" ;;
         t) ISO_POOL="$OPTARG" ;;
         i) INITSYS="$OPTARG" ;;
@@ -363,7 +385,6 @@ while getopts "${opts}" arg; do
         d) use_dracut=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 
@@ -373,7 +394,7 @@ prepare_build
 
 ${pretend} && display_settings && exit 1
 
-check_root
+check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
 
 prepare_dir "${mnt_dir}"
 prepare_dir "${iso_dir}"

src/lib/base/chroot.sh

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

src/lib/base/message.sh

@@ -1,42 +1,44 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ message
 
 #set +u +o posix
 
+MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-/usr/share/makepkg}
+
 # shellcheck disable=1091
-. /usr/share/makepkg/util.sh
+source "${MAKEPKG_LIBRARY}"/util.sh
 
 export LANG=C
 
-shopt -s extglob
-
-if [[ -t 2 && "$TERM" != dumb ]]; then
+if [[ -t 2 && "$TERM" != dumb ]] || [[ ${ARTOOLS_COLOR} == always ]]; then
     colorize
 else
+    # shellcheck disable=2034
     declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
 
-info() {
-    local mesg=$1; shift
-    # shellcheck disable=2059
-    printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
 stat_busy() {
     local mesg=$1; shift
     # shellcheck disable=2059
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
+stat_progress() {
+    # shellcheck disable=2059
+    printf "${BOLD}.${ALL_OFF}" >&2
+}
+
 stat_done() {
     # shellcheck disable=2059
     printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
 lock_close() {
-	local fd=$1
-	exec {fd}>&-
+    local fd=$1
+    exec {fd}>&-
 }
 
 lock() {
@@ -79,7 +81,7 @@ trap_abort() {
 trap_exit() {
     local r=$?
     trap - EXIT INT QUIT TERM HUP
-    cleanup $r
+    cleanup "$r"
 }
 
 cleanup() {
@@ -99,4 +101,28 @@ die() {
     cleanup 255
 }
 
+msg_success() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${GREEN}✓${ALL_OFF}" "${msg}" >&2
+}
+
+msg_error() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${RED}x${ALL_OFF}" "${msg}" >&2
+}
+
+msg_warn() {
+    local msg=$1
+    local padding
+    padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
+    msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
+    printf "%s %s\n" "${padding}${YELLOW}!${ALL_OFF}" "${msg}" >&2
+}
+
 #}}}

src/lib/base/mount.sh

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

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

@@ -0,0 +1,63 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ calamares
+
+yaml_array() {
+    local array
+
+    for entry in "$@"; do
+        array="${array:-}${array:+,} ${entry}"
+    done
+    printf "%s\n" "[${array}]"
+}
+
+write_services_conf() {
+    local key1="$1" key2="$2" val1="$3" val2="$4"
+    local conf="$5"/services-"${INITSYS}".conf
+    local svc
+    svc=$(yaml_array "${SERVICES[@]}")
+
+    yq -n '"---"' > "$conf"
+
+    key1="$key1" key2="$key2" val1="$val1" val2="$val2" svc="$svc" \
+    yq -P 'with(
+        .;
+            eval(strenv(key1)) = env(val1) |
+            eval(strenv(key2)) = env(val2) |
+            .services = env(svc))' \
+        -i "$conf"
+
+    if [[ ${INITSYS} == 's6' ]]; then
+        yq -P '.defaultBundle = "default"' -i "$conf"
+    fi
+}
+
+write_services_openrc_conf(){
+    write_services_conf '.initdDir' '.runlevelsDir' '/etc/init.d' '/etc/runlevels' "$1"
+}
+
+write_services_runit_conf(){
+    write_services_conf '.svDir' '.runsvDir' '/etc/runit/sv' '/etc/runit/runsvdir' "$1"
+}
+
+write_services_s6_conf(){
+    write_services_conf '.svDir' '.dbDir' '/etc/s6/sv' '/etc/s6/rc/compiled' "$1"
+}
+
+write_services_dinit_conf(){
+    write_services_conf '.initdDir' '.runsvDir' '/etc/dinit.d' '/etc/dinit.d/boot.d' "$1"
+}
+
+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
+}
+
+#}}}

src/lib/iso/config.sh

@@ -0,0 +1,32 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ session
+
+configure_services(){
+    local mnt="$1"
+    add_svc_"${INITSYS}" "$mnt" "${SERVICES[*]}"
+}
+
+
+write_live_session_conf(){
+    local conf=''
+    conf+=$(printf '%s\n' '# live session configuration')
+    conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
+    conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
+    printf '%s' "$conf"
+}
+
+configure_chroot(){
+    local fs="$1"
+    msg "Configuring [%s]" "${fs##*/}"
+    configure_services "$fs"
+    configure_calamares "$fs"
+    [[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
+    msg2 "Writing: live.conf"
+    write_live_session_conf > "$fs/etc/artools/live.conf"
+    msg "Done configuring [%s]" "${fs##*/}"
+}
+
+#}}}

src/lib/iso/dracut.sh

@@ -1,4 +1,6 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ dracut
 
@@ -10,7 +12,7 @@ prepare_initramfs_dracut(){
     printf "%s\n" 'add_dracutmodules+=" dmsquash-live"' > "$mnt"/etc/dracut.conf.d/50-live.conf
 
     msg "Starting build: %s" "${kver}"
-    artools-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
+    artix-chroot "$mnt" dracut -fqM /boot/initramfs.img "$kver"
     msg "Image generation successful"
 
     cp "$mnt"/boot/initramfs.img "${iso_root}"/boot/initramfs-"${arch}".img

src/lib/iso/firmware.sh

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

src/lib/iso/grub.sh

@@ -1,28 +1,16 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ grub
 
-configure_grub(){
-    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
-}
-
 prepare_grub(){
     local platform=i386-pc img='core.img' prefix=/boot/grub
     local lib="$1"/usr/lib/grub
     local theme="$1"/usr/share/grub
     local livecfg="$2"/usr/share/grub
-    local grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot
-
+    local grub
+    grub=${iso_root}/boot/grub efi=${iso_root}/efi/boot
 
     prepare_dir "${grub}/${platform}"
 

src/lib/iso/initcpio.sh

@@ -0,0 +1,71 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ 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" mkinitcpio_conf k
+
+    mkinitcpio_conf=mkinitcpio-default.conf
+    [[ "${profile}" == 'base' ]] && mkinitcpio_conf=mkinitcpio-pxe.conf
+    k=$(<"$mnt"/usr/src/linux/version)
+
+    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
+}
+
+#}}}

src/lib/iso/iso.sh

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

src/lib/iso/mount.sh

@@ -1,9 +1,11 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ mount
 
 track_img() {
-    info "mount: [%s]" "$2"
+    msg2 "mount: [%s]" "$2"
     mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
 }
 
@@ -15,7 +17,7 @@ mount_img() {
 
 umount_img() {
     if [[ -n "${IMG_ACTIVE_MOUNTS[*]}" ]];then
-        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
+        msg2 "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
         umount "${IMG_ACTIVE_MOUNTS[@]}"
         unset IMG_ACTIVE_MOUNTS
         rm -r "$1"
@@ -23,7 +25,7 @@ umount_img() {
 }
 
 track_fs() {
-    info "overlayfs mount: [%s]" "$5"
+    msg2 "overlayfs mount: [%s]" "$5"
     mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
 }
 
@@ -45,7 +47,7 @@ mount_overlayfs(){
 
 umount_overlayfs(){
     if [[ -n "${FS_ACTIVE_MOUNTS[*]}" ]];then
-        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
+        msg2 "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
         umount "${FS_ACTIVE_MOUNTS[@]}"
         unset FS_ACTIVE_MOUNTS
         rm -rf "${mnt_dir}/work"

src/lib/iso/profile.sh

@@ -0,0 +1,93 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ profile
+
+show_profile(){
+    msg2 "iso_file: %s" "${iso_file}"
+    msg2 "AUTOLOGIN: %s" "${AUTOLOGIN}"
+    msg2 "PASSWORD: %s" "${PASSWORD}"
+    msg2 "SERVICES: %s" "${SERVICES[*]}"
+}
+
+load_profile(){
+    local profile_dir="${DATADIR}/iso-profiles"
+    [[ -d "${WORKSPACE_DIR}"/iso-profiles ]] && profile_dir="${WORKSPACE_DIR}"/iso-profiles
+
+    root_list="$profile_dir/${profile}/Packages-Root"
+    root_overlay="$profile_dir/${profile}/root-overlay"
+
+    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && live_list="$profile_dir/${profile}/Packages-Live"
+    [[ -d "$profile_dir/${profile}/live-overlay" ]] && live_overlay="$profile_dir/${profile}/live-overlay"
+
+    common_dir="${DATADIR}/iso-profiles/common"
+    [[ -d "$profile_dir"/common ]] && common_dir="${profile_dir}"/common
+
+    [[ -f $profile_dir/${profile}/profile.conf ]] || return 1
+
+    # shellcheck source=contrib/iso/profile.conf.example
+    [[ -r "$profile_dir/${profile}"/profile.conf ]] && . "$profile_dir/${profile}"/profile.conf
+
+    AUTOLOGIN=${AUTOLOGIN:-true}
+
+    PASSWORD=${PASSWORD:-'artix'}
+
+    if [[ -z "${SERVICES[*]}" ]];then
+        SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+    fi
+
+    return 0
+}
+
+read_from_list() {
+    local list="$1"
+    local _space="s| ||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" \
+            | sed "$_space" \
+            | sed "$_init" \
+            | sed "$_clean" | sort -u)
+}
+
+load_pkgs(){
+    local pkglist="$1"
+    packages=()
+
+    if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
+        for l in base apps "${INITSYS}"; do
+            msg2 "Loading Packages: [%s] ..." "Packages-${l}"
+            read_from_list "${common_dir}/Packages-${l}"
+            packages+=("${pkgs[@]}")
+
+        done
+
+        if [[ -n "${live_list}" ]]; then
+            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[@]}")
+}
+
+#}}}

src/lib/iso/services.sh

@@ -0,0 +1,70 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ services
+
+add_svc_openrc(){
+    local mnt="$1" names="$2" rlvl="${3:-default}"
+    for svc in $names; do
+        if [[ -f $mnt/etc/init.d/$svc ]];then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" rc-update add "$svc" "$rlvl" &>/dev/null
+        fi
+    done
+}
+
+add_svc_runit(){
+    local mnt="$1" names="$2" rlvl="${3:-default}"
+    for svc in $names; do
+        if [[ -d $mnt/etc/runit/sv/$svc ]]; then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" ln -s /etc/runit/sv/"$svc" /etc/runit/runsvdir/"$rlvl" &>/dev/null
+        fi
+    done
+}
+
+add_svc_s6(){
+    local mnt="$1" names="$2" rlvl="${3:-default}" dep
+    dep="$mnt"/etc/s6/sv/"$display_manager"-srv/dependencies.d
+    for svc in $names; do
+        msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+        chroot "$mnt" s6-service add "$rlvl" "$svc"
+        if [[ "$svc" == "$display_manager" ]]; then
+            if [[ -d "$dep" ]]; then
+                touch "$dep"/artix-live
+            fi
+        fi
+    done
+
+    chroot "$mnt" s6-db-reload -r
+
+    local src=/etc/s6/current skel=/etc/s6/skel getty='/usr/bin/agetty -L -8 tty7 115200'
+    # rebuild s6-linux-init binaries
+    chroot "$mnt" rm -r "$src"
+    chroot "$mnt" s6-linux-init-maker -1 -N -f "$skel" -G "$getty" -c "$src" "$src"
+    chroot "$mnt" mv "$src"/bin/init "$src"/bin/s6-init
+    chroot "$mnt" cp -a "$src"/bin /usr
+}
+
+add_svc_suite66(){
+    local mnt="$1" names="$2"
+    for svc in $names; do
+        if [[ -f "$mnt"/etc/66/service/"$svc" ]]; then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" 66-enable -t default "$svc" &>/dev/null
+        fi
+    done
+}
+
+add_svc_dinit(){
+    local mnt="$1" names="$2"
+    for svc in $names; do
+        if [[ -d $mnt/etc/dinit.d/boot.d ]]; then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" ln -s ../"$svc" /etc/dinit.d/boot.d/"$svc" &>/dev/null
+        fi
+    done
+}
+
+#}}}

src/lib/iso/squash.sh

@@ -1,25 +1,9 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #{{{ squash
 
-make_sig () {
-    local file="$1"
-    msg2 "Creating signature file..."
-    cd "${iso_root}${live_dir}"
-    chown "${owner}:$(id --group "${owner}")" "${iso_root}${live_dir}"
-    su "${owner}" -c "gpg --detach-sign --default-key ${GPG_KEY} $file"
-    chown -R root "${iso_root}${live_dir}"
-    cd "${OLDPWD}"
-}
-
-make_checksum(){
-    local file="$1"
-    msg2 "Creating md5sum ..."
-    cd "${iso_root}${live_dir}"
-    md5sum "$file" > "$file".md5
-    cd "${OLDPWD}"
-}
-
 make_ext_img(){
     local src="$1"
     local size=32G
@@ -85,14 +69,14 @@ make_sfs() {
 
         mksfs_args+=("${sfs_out}")
 
-        mksfs_args+=(-comp xz -b 256K -Xbcj x86 -noappend)
+        mksfs_args+=(-comp "${COMPRESSION}" "${COMPRESSION_ARGS[@]}" -noappend)
 
         mksquashfs "${mksfs_args[@]}"
 
         if ! ${use_dracut}; then
             make_checksum "${img_name}"
             if [[ -n ${GPG_KEY} ]];then
-                make_sig "${img_name}"
+                make_sig "${iso_root}${live_dir}/${img_name}"
             fi
         fi
         if ${persist}; then

src/lib/iso/trap.sh

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

src/lib/iso/util.sh

@@ -0,0 +1,66 @@
+#!/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
+    [[ -r "$conf" ]] && source "$conf"
+
+    CHROOTS_DIR=${CHROOTS_DIR:-'/var/lib/artools'}
+
+    WORKSPACE_DIR=${WORKSPACE_DIR:-"${USER_HOME}/artools-workspace"}
+
+    ARCH=${ARCH:-"$(uname -m)"}
+
+    REPO=${REPO:-'world'}
+
+    ISO_POOL=${ISO_POOL:-"${WORKSPACE_DIR}/iso"}
+
+    ISO_VERSION=${ISO_VERSION:-"$(date +%Y%m%d)"}
+
+    INITSYS=${INITSYS:-'openrc'}
+
+    GPG_KEY=${GPG_KEY:-''}
+
+    COMPRESSION="${COMPRESSION:-zstd}"
+
+    COMPRESSION_LEVEL="${COMPRESSION_LEVEL:-15}"
+
+    if [[ -z "${COMPRESSION_ARGS[*]}" ]]; then
+        COMPRESSION_ARGS=(-Xcompression-level "${COMPRESSION_LEVEL}")
+    fi
+
+    if [[ "${COMPRESSION}" == 'xz' ]]; then
+        COMPRESSION_ARGS=(-Xbcj x86)
+    fi
+
+    return 0
+}
+
+#}}}
+
+load_iso_config "${USER_CONF_DIR}" || load_iso_config "${SYSCONFDIR}"
+
+prepare_dir "${ISO_POOL}"

src/lib/pkg/admin.sh

@@ -0,0 +1,75 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${ARTOOLS_INCLUDE_ADMIN_SH:-} ]] || return 0
+ARTOOLS_INCLUDE_ADMIN_SH=1
+
+set -e
+
+artixpkg_admin_usage() {
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+    Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+    COMMANDS
+        transfer          Transfer obsolete repository to landfill
+        query             Query maintainers and topics
+        topic             Manage topics
+
+    OPTIONS
+        -h, --help     Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} transfer libfoo libbar
+        $ ${COMMAND} query --maintainer tux
+        $ ${COMMAND} query --topic kf5
+_EOF_
+}
+
+artixpkg_admin() {
+    if (( $# < 1 )); then
+        artixpkg_admin_usage
+        exit 0
+    fi
+
+    # option checking
+    while (( $# )); do
+        case $1 in
+        -h|--help)
+            artixpkg_admin_usage
+            exit 0
+        ;;
+        transfer)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/admin/transfer.sh
+            source "${LIBDIR}"/pkg/admin/transfer.sh
+            artixpkg_admin_transfer "$@"
+            exit 0
+        ;;
+        query)
+            _ARTOOLS_COMMAND+=" $1"
+            shift
+            # shellcheck source=src/lib/pkg/admin/query.sh
+            source "${LIBDIR}"/pkg/admin/query.sh
+            artixpkg_admin_query "$@"
+            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
+        ;;
+        -*)
+            die "invalid argument: %s" "$1"
+        ;;
+        *)
+            die "invalid command: %s" "$1"
+        ;;
+        esac
+    done
+}

src/lib/pkg/admin/query.sh

@@ -0,0 +1,89 @@
+#!/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
+            ;;
+            --maintainer=*)
+                MAINTAINER="${1#*=}"
+                shift
+            ;;
+            -t|--topic)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                TOPIC="$2"
+                shift 2
+            ;;
+            --topic=*)
+                TOPIC="${1#*=}"
+                shift
+            ;;
+            --)
+                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/topic.sh

@@ -0,0 +1,139 @@
+#!/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              Add a topic
+        -d, --del              Delete a topic
+        -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
+        -h, --help             Show this help text
+
+    EXAMPLES
+        $ ${COMMAND} --add mytopic libfoo
+        $ ${COMMAND} --del mytopic libbar
+        $ ${COMMAND} --add mytopic libfoo libbar
+        $ ${COMMAND} --del mytopic libfoo libbar
+_EOF_
+}
+
+
+
+artixpkg_admin_topic() {
+    if (( $# < 1 )); then
+        artixpkg_admin_topic_usage
+        exit 0
+    fi
+
+    # options
+    local pkgbases=()
+    local pkgbase
+
+    local ADD_TOPIC
+    local DEL_TOPIC
+    local ADD=0
+    local DEL=0
+    local jobs=
+    jobs=$(nproc)
+
+    local RUNCMD=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+
+    while (( $# )); do
+        case $1 in
+            -a|--add)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                ADD_TOPIC="$2"
+                ADD=1
+                RUNCMD+=" -a ${ADD_TOPIC}"
+                shift 2
+            ;;
+            --add=*)
+                ADD_TOPIC="${1#*=}"
+                ADD=1
+                RUNCMD+=" --add=${ADD_TOPIC}"
+                shift
+            ;;
+            -d|--del)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                DEL_TOPIC="$2"
+                DEL=1
+                RUNCMD+=" -d ${DEL_TOPIC}"
+                shift 2
+            ;;
+            --del=*)
+                DEL_TOPIC="${1#*=}"
+                DEL=1
+                RUNCMD+=" --del=${DEL_TOPIC}"
+                shift
+            ;;
+            -h|--help)
+                artixpkg_admin_topic_usage
+                exit 0
+            ;;
+            -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
+
+            # topics meta
+            if (( ADD )); then
+                local gitname
+                gitname=$(get_compliant_name "${pkgbase}")
+                if ! add_topic "${gitname}" "${ADD_TOPIC}"; then
+                    warning "failed to add the topic: ${ADD_TOPIC}"
+                fi
+            fi
+
+            if (( DEL )); then
+                local gitname
+                gitname=$(get_compliant_name "${pkgbase}")
+                if ! remove_topic "${gitname}" "${DEL_TOPIC}"; then
+                    warning "failed to delete the topic: ${DEL_TOPIC}"
+                fi
+            fi
+
+        done
+
+    fi
+}

src/lib/pkg/admin/transfer.sh

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

src/lib/pkg/api/gitea.sh

@@ -0,0 +1,140 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#{{{ gitea api
+
+get_compliant_name() {
+    local name=$1
+    printf "%s\n" "${name}" \
+    | sed -E 's/([a-zA-Z0-9]+)\+([a-zA-Z]+)/\1-\2/g' \
+    | sed -E 's/\+/plus/g' \
+    | sed -E 's/[^a-zA-Z0-9_\-\.]/-/g' \
+    | sed -E 's/[_\-]{2,}/-/g'
+}
+
+api_put() {
+    curl -s -X PUT "$@"
+}
+
+api_delete() {
+    curl -s -X DELETE "$@"
+}
+
+api_post() {
+    curl -s -X POST "$@"
+}
+
+api_patch() {
+    curl -s -X PATCH "$@"
+}
+
+api_get() {
+    curl -s -X GET "$@"
+}
+
+add_team_to_repo() {
+    local pkgbase="$1"
+    local team="$2"
+    local url
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/teams/$team"
+
+    stat_busy "Adding team ($team) to package repo [$pkgbase]"
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+remove_team_from_repo() {
+    local pkgbase="$1"
+    local team="$2"
+    local url
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/teams/$team"
+
+    stat_busy "Removing team ($team) from package repo [$pkgbase]"
+    api_delete "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+create_repo() {
+    local pkgbase="$1"
+    local url json
+    url="${GIT_HTTPS}/api/v1/org/${GIT_ORG}/repos"
+    json="{ \"auto_init\": true, \"name\": \"$pkgbase\", \"gitignores\": \"ArtixLinuxPackages\", \"readme\": \"Default\" }"
+
+    stat_busy "Create package repo [$pkgbase] in org (${GIT_ORG})"
+    api_post "$url" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "$json"
+    stat_done
+}
+
+transfer_repo() {
+    local pkgbase="$1"
+    local new_owner="$2"
+    local json url
+    json="{ \"new_owner\": \"$new_owner\",  \"team_ids\": [] }"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/transfer"
+
+    stat_busy "Transfer package repo [$pkgbase] in org ($new_owner)"
+    api_post "$url" \
+        -H "accept: application/json" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}" \
+        -d "$json"
+    stat_done
+}
+
+list_all_repos() {
+    local url
+    url="${GIT_HTTPS}/api/v1/orgs/${GIT_ORG}/repos?limit=10000"
+
+    stat_busy "Query all packages"
+    api_get "$url" \
+        -H "accept: application/json"
+    stat_done
+}
+
+add_topic() {
+    local url
+    local pkgbase="$1"
+    local topic="$2"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics/$topic"
+
+    stat_busy "Add topic ($topic) to [$pkgbase]"
+    api_put "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+remove_topic() {
+    local url
+    local pkgbase="$1"
+    local topic="$2"
+    url="${GIT_HTTPS}/api/v1/repos/${GIT_ORG}/$pkgbase/topics/$topic"
+
+    stat_busy "Remove topic ($topic) from [$pkgbase]"
+    api_delete "$url" \
+        -H "accept: application/json" \
+        -H "Authorization: token ${GIT_TOKEN}"
+    stat_done
+}
+
+search_topic() {
+    local search="$1"
+    local url
+    url="${GIT_HTTPS}/api/v1/repos/search?q=${search}&topic=true&includeDesc=false&private=false&is_private=false&template=false&archived=false&order=asc&limit=10000"
+
+    stat_busy "Query for topic (${search})"
+    api_get "$url" \
+        -H 'accept: application/json'
+    stat_done
+}
+
+#}}}

src/lib/pkg/db/db.sh

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

src/lib/pkg/deploy.sh

@@ -1,6 +1,10 @@
 #!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-#{{{ deploy
+#{{{ functions
+
+shopt -s extglob
 
 find_cached_pkgfile() {
     local searchdirs=("$PKGDEST" "$PWD") results=()
@@ -25,4 +29,6 @@ find_cached_pkgfile() {
     esac
 }
 
+shopt -u extglob
+
 #}}}

src/lib/pkg/diff.sh

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