From 8e1a352fbd9343194199e3b46ff79562b695b62e Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sun, 29 Sep 2013 02:12:01 -0700 Subject: [PATCH 01/32] Fork packer --- packer | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/packer b/packer index c7eee90..8a94593 100644 --- a/packer +++ b/packer @@ -1,4 +1,16 @@ #!/bin/bash +###################################################################### +# apacman - AUR wrapper forked from packer +version="0.5" +# Copyright OS Hazard +# +# New Features: +# * Saves AUR packages to /var/cache/apacman/pkg +# * --needed does not install up-to-date packages +# * --ignorearch ignores architectures specified in PKGBUILD +# * partial passthrough for -R, -Q, and -U parameters +###################################################################### + # Copyright Matthew Bruenig # 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 @@ -23,6 +35,7 @@ mkdir -p "$tmpdir" makepkgconf='/etc/makepkg.conf' usermakepkgconf="$HOME/.makepkg.conf" pacmanconf='/etc/pacman.conf' +saveDir='/var/cache/apacman/pkg' RPCURL="https://aur.archlinux.org/rpc.php?type" PKGURL="https://aur.archlinux.org" @@ -60,6 +73,9 @@ usage() { echo ' -Si - outputs info for package' echo ' -G - download and extract aur tarball only' echo + echo ' --needed - do not install up-to-date packages' + echo ' --ignorearch - ignore a missing or incomplete architecture field' + echo echo ' --quiet - only output package name for searches' echo ' --ignore - takes a comma-separated list of packages to ignore' echo ' --noconfirm - do not prompt for any confirmation' @@ -281,7 +297,7 @@ confirm_edit() { # Installs packages from aur ($1 is package, $2 is dependency or explicit) aurinstall() { - dir="${TMPDIR:-/tmp}/packerbuild-$UID/$1" + dir="${TMPDIR:-/tmp}/pkgbuild-$UID/$1" sourcemakepkgconf # Prepare the installation directory @@ -325,6 +341,13 @@ aurinstall() { fi [[ $? -ne 0 ]] && echo "The build failed." && return 1 + + if [ ! -d $saveDir ]; then + runasroot mkdir -p $saveDir + fi + runasroot cp $pkgname-*$PKGEXT $saveDir/ + echo "Saved: $(ls $pkgname-*$PKGEXT)"; + if [[ $2 = dependency ]]; then runasroot $PACMAN ${PACOPTS[@]} --asdeps -U $pkgname-*$PKGEXT elif [[ $2 = explicit ]]; then @@ -391,7 +414,12 @@ installhandling() { if existsinlocal "$pkg"; then localversion="$(pacman -Qs "$pkg" | grep -F "local/$pkg" | cut -d ' ' -f 2)" if ! aurversionisnewer "$pkg" "$localversion"; then - echo -e "${COLOR6}warning:$ENDCOLOR $pkg-$localversion is up to date -- reinstalling" + if [ "$needed" = "1" ]; then + echo -e "${COLOR6}notice:$ENDCOLOR $pkg-$localversion is up to date -- skipping" + aurtargets=(${aurtargets[@]/$pkg/}); + else + echo -e "${COLOR6}warning:$ENDCOLOR $pkg-$localversion is up to date -- reinstalling" + fi fi fi done @@ -417,6 +445,12 @@ installhandling() { echo -e "${COLOR6}Pacman Targets (${#pacmandepends[@]}):${ENDCOLOR} ${pacmandepends[@]}" fi + # Sanity check + totalcount="$((${#aurdepends[@]}+${#aurtargets[@]}+${#pacmandepends[@]}))" + if [ "$totalcount" = "0" ]; then + echo -e "${COLOR5}==>$ENDCOLOR nothing to do"; exit 0; + fi + # Prompt to proceed echo -en "\nProceed with installation? [Y/n] " if ! [[ $noconfirm ]]; then @@ -491,6 +525,16 @@ nap() { done } +# Wrap pacman parameters +pacwrap() { + if [[ $1 = -Q* ]]; then + $PACMAN "$@"; + else + runasroot $PACMAN "$@"; + fi; + exit 0; +} + # Argument parsing [[ $1 ]] || usage packageargs=() @@ -502,15 +546,20 @@ while [[ $1 ]]; do '-Si') option=info ;; -S*u*) option=update ; pacmanarg="$1" ;; '-G') option=download ;; + -R*) pacwrap "$@" ;; + -Q*) pacwrap "$@" ;; + -U*) pacwrap "$@" ;; '-h'|'--help') usage ;; '--quiet') quiet='1' ;; '--ignore') ignorearg="$2" ; PACOPTS+=("--ignore" "$2") ; shift ;; '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; + '--needed') needed='1' PACOPTS+=("--needed");; '--noedit') noedit='1' ;; '--auronly') auronly='1' ;; '--quickcheck') quickcheck='1' ;; '--devel') devel='1' ;; - '--skipinteg') MAKEPKGOPTS="--skipinteg" ;; + '--skipinteg') MAKEPKGOPTS+=("--skipinteg");; + '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; '--preview') preview='1' ;; '--') shift ; packageargs+=("$@") ; break ;; -*) echo "packer: Option \`$1' is not valid." ; exit 5 ;; From 1e0231a2cc9fda73b5eb76cd3e02cdc04c0df4cc Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sun, 29 Sep 2013 02:14:58 -0700 Subject: [PATCH 02/32] apacman version 0.5 --- README.md | 11 +++++++++++ packer => apacman | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 README.md rename packer => apacman (99%) diff --git a/README.md b/README.md new file mode 100644 index 0000000..e5e8cda --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +apacman +================== + +ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer + +Features: +* All features from packer +* Saves built AUR packages to /var/cache/apacman/pkg +* --needed parameter that does not install up-to-date packages +* --ignorearch parameter that ignores architectures specified in PKGBUILD (useful for ARM devices) +* Partial passthrough support for -R, -Q, and -U pacman parameters diff --git a/packer b/apacman similarity index 99% rename from packer rename to apacman index 8a94593..6c2d7b4 100644 --- a/packer +++ b/apacman @@ -28,7 +28,7 @@ version="0.5" [[ $PACMAN ]] || PACMAN="pacman" # set tmpfile stuff, clean tmpdir -tmpdir="${TMPDIR:-/tmp}/packertmp-$UID" +tmpdir="${TMPDIR:-/tmp}/apacmantmp-$UID" rm -rf "$tmpdir" &>/dev/null mkdir -p "$tmpdir" @@ -65,7 +65,7 @@ err() { } usage() { - echo 'usage: packer [option] [package] [package] [...]' + echo 'usage: apacman [option] [package] [package] [...]' echo echo ' -S - installs package' echo ' -Syu|-Su - updates all packages, also takes -uu and -yy options' @@ -562,7 +562,7 @@ while [[ $1 ]]; do '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; '--preview') preview='1' ;; '--') shift ; packageargs+=("$@") ; break ;; - -*) echo "packer: Option \`$1' is not valid." ; exit 5 ;; + -*) echo "apacman: Option \`$1' is not valid." ; exit 5 ;; *) packageargs+=("$1") ;; esac shift From b4e1bcaf311081c0266a1f687a1abe32508c3dda Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sun, 29 Sep 2013 02:31:22 -0700 Subject: [PATCH 03/32] Add GPL license --- LICENSE | 678 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ apacman | 0 2 files changed, 678 insertions(+) create mode 100644 LICENSE mode change 100644 => 100755 apacman diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..fc22cc2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,678 @@ + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. [http://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 [http://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: + + {project} Copyright (C) {year} {fullname} + 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 +[http://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 +[http://www.gnu.org/philosophy/why-not-lgpl.html]. + + + diff --git a/apacman b/apacman old mode 100644 new mode 100755 From 0f087584893448c4c8b0da496c97316a65a6867f Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Thu, 7 Nov 2013 22:09:17 -0800 Subject: [PATCH 04/32] Update apacman with new features and manpage --- README.md | 3 ++ apacman | 68 +++++++++++++++++++++++++++++++++---- packer.8 => apacman.8 | 79 ++++++++++++++++++++++++++++++------------- 3 files changed, 120 insertions(+), 30 deletions(-) rename packer.8 => apacman.8 (65%) diff --git a/README.md b/README.md index e5e8cda..7ca0477 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg +* Uses AUR package cache directory if applicable [new] * --needed parameter that does not install up-to-date packages * --ignorearch parameter that ignores architectures specified in PKGBUILD (useful for ARM devices) +* --skipcache parameter that skips check for pre-built package in cache directory [new] +* --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs [new] * Partial passthrough support for -R, -Q, and -U pacman parameters diff --git a/apacman b/apacman index 6c2d7b4..a29507d 100755 --- a/apacman +++ b/apacman @@ -1,13 +1,16 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="0.5" +version="0.6" # Copyright OS Hazard # # New Features: # * Saves AUR packages to /var/cache/apacman/pkg -# * --needed does not install up-to-date packages -# * --ignorearch ignores architectures specified in PKGBUILD +# * Uses AUR package cache directory if applicable +# * --needed does not install up-to-date packages +# * --ignorearch ignores architectures specified in PKGBUILD +# * --skipcache skips check for pre-built package in cache directory +# * --cachevcs installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs # * partial passthrough for -R, -Q, and -U parameters ###################################################################### @@ -75,6 +78,8 @@ usage() { echo echo ' --needed - do not install up-to-date packages' echo ' --ignorearch - ignore a missing or incomplete architecture field' + echo ' --skipcache - skips check for pre-built package in cache directory' + echo ' --cachevcs - installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs' echo echo ' --quiet - only output package name for searches' echo ' --ignore - takes a comma-separated list of packages to ignore' @@ -295,6 +300,55 @@ confirm_edit() { fi } +# Checks if aur cache is newer than aur ($1 is package, $2 is aur version) +checkvcs() { + if [ "$cachevcs" = "1" ]; then + cachefile=$(ls --sort=time ${saveDir}/${1}-*-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1 | awk -F "${saveDir}/${1}-" '{print $2}'); + cachever=$(echo "$cachefile" | sed "s/-any.pkg.tar.xz//g;s/-any.pkg.tar//g;s/-${makearch}.pkg.tar.xz//g;s/-${makearch}.pkg.tar//g"); + if [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -gt 0 ]]; then + echo -e "${COLOR7}warning:${ENDCOLOR} $pkg -- ${COLOR7}verify cache newer than AUR${ENDCOLOR} ($pkgver-$pkgrel)" + pkgfile="${saveDir}/${1}-${cachefile}"; + elif [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -eq 0 ]]; then + pkgfile="${saveDir}/${1}-${cachefile}"; + fi + fi; +} + +# Checks if packages are in aur cache ($1 is package, $2 is dependency or explicit) +checkcache() { + unset pkgfile; + + if [ "$skipcache" != "1" ]; then + sourcemakepkgconf + makearch=$(grep ^CARCH= "/etc/makepkg.conf" 2>/dev/null | grep -o -e =.*[0-9A-Za-z] | sed 's/^="//'); + pkgfile=$(ls ${saveDir}/${1}-${pkgver}-${pkgrel}-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1); + fi + + if [ "$cachevcs" = "1" ]; then + checkvcs $1 $pkgver-$pkgrel + fi + + if [ -f "$pkgfile" ]; then + cacheinstall "$pkgfile" "$2" + else + aurinstall "$1" "$2" + fi; +} + +cacheinstall() { + if [ "$cachevcs" = "1" ]; then + echo -e "${COLOR6}notice:$ENDCOLOR installing $pkg-$cachever from cache" + else + echo -e "${COLOR6}notice:$ENDCOLOR installing $pkg-$pkgver-$pkgrel from cache" + fi + + if [[ $2 = dependency ]]; then + runasroot $PACMAN ${PACOPTS[@]} --asdeps -U "$1" + elif [[ $2 = explicit ]]; then + runasroot $PACMAN ${PACOPTS[@]} -U "$1" + fi +} + # Installs packages from aur ($1 is package, $2 is dependency or explicit) aurinstall() { dir="${TMPDIR:-/tmp}/pkgbuild-$UID/$1" @@ -346,7 +400,7 @@ aurinstall() { runasroot mkdir -p $saveDir fi runasroot cp $pkgname-*$PKGEXT $saveDir/ - echo "Saved: $(ls $pkgname-*$PKGEXT)"; + echo -e "${COLOR5} -> ${COLOR1}Saved package:$ENDCOLOR $(ls $pkgname-*$PKGEXT)"; if [[ $2 = dependency ]]; then runasroot $PACMAN ${PACOPTS[@]} --asdeps -U $pkgname-*$PKGEXT @@ -467,7 +521,7 @@ installhandling() { # Install aur dependencies if [[ $aurdepends ]]; then for dep in "${aurdepends[@]}"; do - aurinstall "$dep" "dependency" + checkcache "$dep" "dependency" done fi @@ -475,7 +529,7 @@ installhandling() { for package in "${aurtargets[@]}"; do scrapeaurdeps "$package" if pacman -T "${dependencies[@]}" &>/dev/null; then - aurinstall "$package" "explicit" + checkcache "$package" "explicit" else echo "Dependencies for \`$package' are not met, not building..." fi @@ -558,6 +612,8 @@ while [[ $1 ]]; do '--auronly') auronly='1' ;; '--quickcheck') quickcheck='1' ;; '--devel') devel='1' ;; + '--skipcache') skipcache='1' ;; + '--cachevcs') cachevcs='1' ;; '--skipinteg') MAKEPKGOPTS+=("--skipinteg");; '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; '--preview') preview='1' ;; diff --git a/packer.8 b/apacman.8 similarity index 65% rename from packer.8 rename to apacman.8 index 23aefde..5ed4c0f 100644 --- a/packer.8 +++ b/apacman.8 @@ -1,13 +1,13 @@ '\" t -.\" Title: packer +.\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 03/27/2010 -.\" Manual: Pacman Manual -.\" Source: Pacman +.\" Date: 11/07/2013 +.\" Manual: apacman Manual +.\" Source: apacman .\" Language: English .\" -.TH "PACKER" "8" "03/27/2010" "Packer" "Packer Manual" +.TH "APACMAN" "8" "11/07/2013" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -19,13 +19,14 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -packer \- package manager utility for pacman repositories and the AUR +apacman \- AUR wrapper forked from packer .SH "SYNOPSIS" .sp -\fIpacman\fR [options] [packages] +\fIapacman\fR [options] [packages] .SH "DESCRIPTION" .sp -Packer is a bash wrapper for pacman and the AUR\&. It was designed to be a simple and very fast replacement for the basic functionality of yaourt\&. It allows you to install, update, search, and show information for any package in the main repositories and in the AUR\&. For other commands, such as removing packages, use pacman\&. +apacman is a bash wrapper forked from packer for pacman and the ArchLinux User Repository (AUR)\&. It adds package saving functionality and some extra +pass-through options for makepkg and pacman. .SH "OPERATIONS" .PP \fB\-Ss\fR @@ -59,6 +60,26 @@ Show packer usage\&. .RE .SH "OPTIONS" .PP +\fB\-\-needed\fR +.RS 4 +Does not install up-to-date packages\&. +.RE +.PP +\fB\-\-ignorearch\fR +.RS 4 +ignores architectures specified in PKGBUILD\&. +.RE +.PP +\fB\-\-skipcache\fR +.RS 4 +skips check for pre-built package in cache directory\&. +.RE +.PP +\fB\-\-cachevcs\fR +.RS 4 +installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs\&. +.RE +.PP \fB\-\-ignore\fR <\'package\'> .RS 4 Ignore packages\&. Separate package names with a comma\&. @@ -100,7 +121,7 @@ Always offer to edit the pkgbuild before sourcing it. To always force preview, .RE .SH "INTERACTIVE MODE" .sp -Use packer without any operations or options to use the interactive mode\&. Packer will show a numbered list of search results\&. To install a package, enter the corresponding number\&. +Use apacman without any operations or options to use the interactive mode\&. apacman will show a numbered list of search results\&. To install a package, enter the corresponding number\&. .SH "EXAMPLE USAGE" .sp .RS 4 @@ -112,7 +133,7 @@ Use packer without any operations or options to use the interactive mode\&. Pack .IP \(bu 2.3 .\} Sync and update all packages: -packer \-Syu +apacman \-Syu .RE .sp .RS 4 @@ -124,7 +145,7 @@ packer \-Syu .IP \(bu 2.3 .\} Update only AUR packages: -packer \-Syu \-\-auronly +apacman \-Syu \-\-auronly .RE .sp .RS 4 @@ -136,7 +157,7 @@ packer \-Syu \-\-auronly .IP \(bu 2.3 .\} Update, and reinstall packages that were installed from a revision control source: -packer \-Syu \-\-devel +apacman \-Syu \-\-devel .RE .sp For a package called \fIname\fR: @@ -150,7 +171,7 @@ For a package called \fIname\fR: .IP \(bu 2.3 .\} Search: -packer \-Ss \fIname\fR +apacman \-Ss \fIname\fR .RE .sp .RS 4 @@ -162,7 +183,7 @@ packer \-Ss \fIname\fR .IP \(bu 2.3 .\} Install: -packer \-S \fIname\fR +apacman \-S \fIname\fR .RE .sp .RS 4 @@ -174,7 +195,7 @@ packer \-S \fIname\fR .IP \(bu 2.3 .\} Install without confirmations: -packer \-S \-\-noconfirm \fIname\fR +apacman \-S \-\-noconfirm \fIname\fR .RE .sp .RS 4 @@ -186,7 +207,7 @@ packer \-S \-\-noconfirm \fIname\fR .IP \(bu 2.3 .\} Get information about a package: -packer \-Si \fIname\fR +apacman \-Si \fIname\fR .RE .sp .RS 4 @@ -198,11 +219,23 @@ packer \-Si \fIname\fR .IP \(bu 2.3 .\} Search and install in interactive mode: -packer \fIname\fR +apacman \fIname\fR .RE .SH "CONFIGURATION" .sp -Packer uses these settings in /etc/pacman\&.conf: +apacman defaults to saving succesfully built packages to /var/cache/apacman/pkg. +.sp +apacman uses the AUR package cache directory if applicable (unless \-\-skipcache parameter) +.sp +By default VCS package versions are compared via PKGBUILD in AUR (unless \-\-cachevcs parameter) +.sp +apacman output will be colorized unless the environmental variable COLOR is set to `NO'. +.sp +To manually edit files, packer uses the EDITOR variable\&. If EDITOR is not set then the default editor is vi\&. +.sp +Packages are built in the TMPDIR path\&. If the TMPDIR variable is not set then the default path is /tmp +.sp +apacman uses these settings in /etc/pacman\&.conf: .sp .RS 4 .ie n \{\ @@ -214,15 +247,13 @@ Packer uses these settings in /etc/pacman\&.conf: .\} IgnorePkg .RE -.sp -Packer output will be colorized unless the environmental variable COLOR is set to `NO'. -.sp -To manually edit files, packer uses the EDITOR variable\&. If EDITOR is not set then the default editor is vi\&. -.sp -Packages are built in the TMPDIR path\&. If the TMPDIR variable is not set then the default path is /tmp .SH "SEE ALSO" .sp \fBpacman\fR(8) +.sp +\fBpacker\fR(8) .SH "AUTHORS" .sp +OS Hazard +.sp Matthew Bruenig From b32d3283b506335c1669e1cb84782112c3fc62c2 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Thu, 7 Nov 2013 22:33:09 -0800 Subject: [PATCH 05/32] Fix markdown --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7ca0477..ed3813f 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg -* Uses AUR package cache directory if applicable [new] +* Uses AUR package cache directory if applicable **new** * --needed parameter that does not install up-to-date packages * --ignorearch parameter that ignores architectures specified in PKGBUILD (useful for ARM devices) -* --skipcache parameter that skips check for pre-built package in cache directory [new] -* --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs [new] +* --skipcache parameter that skips check for pre-built package in cache directory **new** +* --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs **new** * Partial passthrough support for -R, -Q, and -U pacman parameters From b80b495091fc002bccecf1dfd0f704c7105c771f Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Thu, 7 Nov 2013 22:34:31 -0800 Subject: [PATCH 06/32] More markdown fixes --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ed3813f..a3289b3 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg -* Uses AUR package cache directory if applicable **new** +* **new** Uses AUR package cache directory if applicable * --needed parameter that does not install up-to-date packages * --ignorearch parameter that ignores architectures specified in PKGBUILD (useful for ARM devices) -* --skipcache parameter that skips check for pre-built package in cache directory **new** -* --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs **new** +* **new** --skipcache parameter that skips check for pre-built package in cache directory +* **new** --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs * Partial passthrough support for -R, -Q, and -U pacman parameters From 17564e793025d3ed8823aee00a0d86e24e1a689a Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Fri, 2 Jan 2015 01:42:11 -0800 Subject: [PATCH 07/32] Merge packer updates and add root workaround --- README.md | 1 + apacman | 62 ++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index a3289b3..38c1bec 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* **new** run as root workaround for Pacman 4.2+ * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg * **new** Uses AUR package cache directory if applicable diff --git a/apacman b/apacman index a29507d..d47169b 100755 --- a/apacman +++ b/apacman @@ -1,10 +1,11 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="0.6" +version="0.7" # Copyright OS Hazard # # New Features: +# * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable # * --needed does not install up-to-date packages @@ -67,6 +68,16 @@ err() { exit 1 } +version() { + pacver=$(pacman -V 2>/dev/null | grep -o "Pacman v.*") + echo " === = = ===== apacman v${version} - forked from packer" + echo " = = = = = = ${pacver}" + echo ' ===== = = ====' + echo ' = = = = = = This program may be freely redistributed under' + echo ' = = === = = the terms of the GNU General Public License.' + exit +} + usage() { echo 'usage: apacman [option] [package] [package] [...]' echo @@ -90,6 +101,7 @@ usage() { echo ' --devel - update devel packages during -Su' echo ' --skipinteg - when using makepkg, do not check md5s' echo ' --preview - edit pkgbuild before sourcing' + echo ' -V - display version' echo ' -h - outputs this message' exit } @@ -136,7 +148,9 @@ existsinpacman() { # Tests whether $1 is provided in pacman, sets globally accessibly providepkg var providedinpacman() { + unset providepkg IFS=$'\n' read -rd '' -a providepkg < <(pacman -Ssq -- "^$1$") + [[ -n $providepkg ]] } # Tests whether $1 exists in a pacman group @@ -264,9 +278,9 @@ pkginfo() { curl -Lfs "${pkgpath%/*}/PKGBUILD" > "$tmpdir/$1.PKGBUILD" if [[ $2 ]]; then # rename for syntax highlighting - ln -sf "$tmpdir/$1.PKGBUILD" "$tmpdir/PKGBUILD" + cp "$tmpdir/$1.PKGBUILD" "$tmpdir/PKGBUILD" confirm_edit "${COLOR6}Edit $1 PKGBUILD with \$EDITOR? [Y/n]${ENDCOLOR} " "$tmpdir/PKGBUILD" - rm -f "$tmpdir/PKGBUILD" + mv "$tmpdir/PKGBUILD" "$tmpdir/$1.PKGBUILD" fi fi } @@ -376,6 +390,13 @@ aurinstall() { fi fi + # check for missing arch + if [[ ! " ${arch[@]} " =~ " any " ]]; then + if [[ ! " ${arch[@]} " =~ " ${CARCH} " ]]; then + echo -e "${COLOR6}warning:$ENDCOLOR $CARCH missing from arch array" + fi + fi + # Allow user to edit PKGBUILD confirm_edit "${COLOR6}Edit $1 PKGBUILD with \$EDITOR? [Y/n]${ENDCOLOR} " PKGBUILD if ! [[ -f PKGBUILD ]]; then @@ -388,14 +409,22 @@ aurinstall() { confirm_edit "${COLOR6}Edit $install with \$EDITOR? [Y/n]${ENDCOLOR} " "$install" # Installation (makepkg and pacman) + rm -f *$PKGEXT if [[ $UID -eq 0 ]]; then - makepkg $MAKEPKGOPTS --asroot -f + id aurbuild >/dev/null 2>/dev/null || useradd -r -d /var/empty aurbuild + chown -R aurbuild:aurbuild . + su -c "makepkg $MAKEPKGOPTS -f" aurbuild else makepkg $MAKEPKGOPTS -f fi [[ $? -ne 0 ]] && echo "The build failed." && return 1 + pkgtarfiles="" + for i in "${pkgname[@]}"; do + pkgtarfiles="$pkgtarfiles $i-*$PKGEXT" + done + # Save packages if [ ! -d $saveDir ]; then runasroot mkdir -p $saveDir fi @@ -403,9 +432,9 @@ aurinstall() { echo -e "${COLOR5} -> ${COLOR1}Saved package:$ENDCOLOR $(ls $pkgname-*$PKGEXT)"; if [[ $2 = dependency ]]; then - runasroot $PACMAN ${PACOPTS[@]} --asdeps -U $pkgname-*$PKGEXT + runasroot $PACMAN ${PACOPTS[@]} --asdeps -U $pkgtarfiles elif [[ $2 = explicit ]]; then - runasroot $PACMAN ${PACOPTS[@]} -U $pkgname-*$PKGEXT + runasroot $PACMAN ${PACOPTS[@]} -U $pkgtarfiles fi } @@ -437,8 +466,10 @@ installhandling() { for package in "${aurpackages[@]}"; do if isignored "$package"; then echo -ne "${COLOR5}:: ${COLOR1}$package is in IgnorePkg/IgnoreGroup. Install anyway?${ENDCOLOR} [Y/n] " - if [[ -z "$noconfirm" && $(! proceed) ]]; then - continue + if ! [[ $noconfirm ]]; then + proceed || continue + else + echo fi fi aurtargets+=("$package") @@ -448,10 +479,14 @@ installhandling() { for package in "${aurdepends[@]}"; do if isignored "$package"; then echo -ne "${COLOR5}:: ${COLOR1}$package is in IgnorePkg/IgnoreGroup. Install anyway?${ENDCOLOR} [Y/n] " - if [[ -z "$noconfirm" && $(! proceed) ]]; then + if ! [[ $noconfirm ]]; then + if ! proceed; then echo "Unresolved dependency \`$package'" unset aurtargets break + fi + else + echo fi fi done @@ -463,6 +498,7 @@ installhandling() { if [[ -z $aurtargets ]]; then exit fi + # Test if aurpackages are already installed; echo warning if so for pkg in "${aurtargets[@]}"; do if existsinlocal "$pkg"; then @@ -600,10 +636,8 @@ while [[ $1 ]]; do '-Si') option=info ;; -S*u*) option=update ; pacmanarg="$1" ;; '-G') option=download ;; - -R*) pacwrap "$@" ;; - -Q*) pacwrap "$@" ;; - -U*) pacwrap "$@" ;; '-h'|'--help') usage ;; + '-V'|'--version') version ;; '--quiet') quiet='1' ;; '--ignore') ignorearg="$2" ; PACOPTS+=("--ignore" "$2") ; shift ;; '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; @@ -618,7 +652,7 @@ while [[ $1 ]]; do '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; '--preview') preview='1' ;; '--') shift ; packageargs+=("$@") ; break ;; - -*) echo "apacman: Option \`$1' is not valid." ; exit 5 ;; + -*) pacwrap "$@" ;; *) packageargs+=("$1") ;; esac shift @@ -711,7 +745,7 @@ if [[ $option = update ]]; then # Check and output ignored package update info for package in "${checkignores[@]}"; do if aurversionisnewer "${package%% *}" "${package##* }"; then - echo -e "${COLOR6}warning:${ENDCOLOR} $package: ignoring package upgrade (${package##* } => $aurversion)" + echo -e "${COLOR6}warning:${ENDCOLOR} ${package%% *}: ignoring package upgrade (${package##* } => $aurversion)" fi done From 356e29e2c1cd9cc70b23bf2d29605d927e9d0d10 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Fri, 2 Jan 2015 02:02:50 -0800 Subject: [PATCH 08/32] Add post install file --- apacman.install | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 apacman.install diff --git a/apacman.install b/apacman.install new file mode 100644 index 0000000..e44fa6f --- /dev/null +++ b/apacman.install @@ -0,0 +1,14 @@ +post_install(){ + echo "==> Must install apacman-deps meta package to compile packages from AUR" + echo "==> Remove build depends with: pacman -Rss apacman-deps" +} + +post_upgrade() { + echo "==> Must install apacman-deps meta package to compile packages from AUR" + echo "==> Remove build depends with: pacman -Rss apacman-deps" +} + +post_remove() { + echo "==> Remove build depends with: pacman -Rss apacman-deps" + userdel aurbuild 2>/dev/null +} From e7d96b1379568f5c9704b5dc8c25eb3ba3bfb8ae Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 7 Jan 2015 05:19:40 -0800 Subject: [PATCH 09/32] Fix package prefix name bug --- apacman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apacman b/apacman index d47169b..85d12bd 100755 --- a/apacman +++ b/apacman @@ -502,7 +502,7 @@ installhandling() { # Test if aurpackages are already installed; echo warning if so for pkg in "${aurtargets[@]}"; do if existsinlocal "$pkg"; then - localversion="$(pacman -Qs "$pkg" | grep -F "local/$pkg" | cut -d ' ' -f 2)" + localversion="$(pacman -Qs "$pkg" | grep -F "local/$pkg " | cut -d ' ' -f 2)" if ! aurversionisnewer "$pkg" "$localversion"; then if [ "$needed" = "1" ]; then echo -e "${COLOR6}notice:$ENDCOLOR $pkg-$localversion is up to date -- skipping" From cc8c6eaafca0c5676a95b1dbae5fe037d6ec6185 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 7 Jan 2015 05:24:33 -0800 Subject: [PATCH 10/32] Update .install --- apacman.install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apacman.install b/apacman.install index e44fa6f..7d3558d 100644 --- a/apacman.install +++ b/apacman.install @@ -1,11 +1,13 @@ post_install(){ echo "==> Must install apacman-deps meta package to compile packages from AUR" echo "==> Remove build depends with: pacman -Rss apacman-deps" + id aurbuild >/dev/null 2>/dev/null || useradd -r -d /var/empty aurbuild } post_upgrade() { echo "==> Must install apacman-deps meta package to compile packages from AUR" echo "==> Remove build depends with: pacman -Rss apacman-deps" + id aurbuild >/dev/null 2>/dev/null || useradd -r -d /var/empty aurbuild } post_remove() { From 163f2305b59400c56f5e1b1075b58a2e8a2c0bf1 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Fri, 9 Jan 2015 05:11:02 -0800 Subject: [PATCH 11/32] Version 0.8 - ABS support, --noaur flag, --warn flag --- README.md | 9 ++-- apacman | 124 +++++++++++++++++++++++++++++++++++++++--------------- apacman.8 | 16 +++++-- 3 files changed, 108 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 38c1bec..07f11f4 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,15 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* **new** Built-in ABS support (-G now support ABS+AUR packages) +* **new** --noaur parameter to skip AUR packages +* **new** --warn parameter makes errors non-fatal (only enable if you know what you are doing) * **new** run as root workaround for Pacman 4.2+ * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg -* **new** Uses AUR package cache directory if applicable +* Uses AUR package cache directory if applicable * --needed parameter that does not install up-to-date packages * --ignorearch parameter that ignores architectures specified in PKGBUILD (useful for ARM devices) -* **new** --skipcache parameter that skips check for pre-built package in cache directory -* **new** --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs +* --skipcache parameter that skips check for pre-built package in cache directory +* --cachevcs parameter installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs * Partial passthrough support for -R, -Q, and -U pacman parameters diff --git a/apacman b/apacman index 85d12bd..68ab164 100755 --- a/apacman +++ b/apacman @@ -1,13 +1,16 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="0.7" +version="0.8" # Copyright OS Hazard # # New Features: +# * Built-in ABS support # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --noaur do not actions for aur +# * --warn treat errors as non-fatal warnings # * --needed does not install up-to-date packages # * --ignorearch ignores architectures specified in PKGBUILD # * --skipcache skips check for pre-built package in cache directory @@ -43,6 +46,7 @@ saveDir='/var/cache/apacman/pkg' RPCURL="https://aur.archlinux.org/rpc.php?type" PKGURL="https://aur.archlinux.org" +ABSURL="rsync.archlinux.org" if [[ -t 1 && ! $COLOR = "NO" ]]; then COLOR1='\e[1;39m' @@ -65,11 +69,15 @@ ctrlc() { err() { echo -e "$1" - exit 1 + [[ "$warn" == 1 ]] || exit 1 +} + +deptest() { + type -p $1 &>/dev/null } version() { - pacver=$(pacman -V 2>/dev/null | grep -o "Pacman v.*") + pacver=$($PACMAN -V 2>/dev/null | grep -o "Pacman v.*") echo " === = = ===== apacman v${version} - forked from packer" echo " = = = = = = ${pacver}" echo ' ===== = = ====' @@ -98,9 +106,11 @@ usage() { echo ' --noedit - do not prompt to edit files' echo ' --quickcheck - check for updates and exit' echo ' --auronly - only do actions for aur' + echo ' --noaur - do not actions for aur' echo ' --devel - update devel packages during -Su' echo ' --skipinteg - when using makepkg, do not check md5s' echo ' --preview - edit pkgbuild before sourcing' + echo ' --warn - treat errors as non-fatal warnings' echo ' -V - display version' echo ' -h - outputs this message' exit @@ -271,6 +281,17 @@ pkglink() { echo "${PKGURL}$(jshon -Q -e results -e URLPath -u < "$tmpdir/$1.info")" } +absrepo() { + pacman -Si -- "$1" 2>/dev/null | grep ^Repository | awk '{print $NF}' | awk NR==1 +} + +# downloads source files ($1 is package repository, $2 is package name) +abslink() { + deptest rsync || err "${COLOR7}error:${ENDCOLOR} $option requires \`rsync'" + rflags="-mrt --info=progress2 --no-motd --delete-after --no-p --no-o --no-g" + rsync $rflags --include=/$1{,/$2} --exclude=/{$1/,}* ${ABSURL}::abs/{${makearch},any}/ . +} + # downloads pkgbuild ($1), edits if $2 is set pkginfo() { if ! [[ -f "$tmpdir/$1.PKGBUILD" ]]; then @@ -334,7 +355,6 @@ checkcache() { if [ "$skipcache" != "1" ]; then sourcemakepkgconf - makearch=$(grep ^CARCH= "/etc/makepkg.conf" 2>/dev/null | grep -o -e =.*[0-9A-Za-z] | sed 's/^="//'); pkgfile=$(ls ${saveDir}/${1}-${pkgver}-${pkgrel}-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1); fi @@ -450,7 +470,7 @@ installhandling() { pacmanpackages+=("$package") elif ! [[ $auronly ]] && existsinpacmangroup "$package"; then pacmanpackages+=("$package") - elif existsinaur "$package"; then + elif ! [[ $noaur ]] && existsinaur "$package"; then if finddeps "$package"; then # here is where dep dupes are created aurpackages+=("$package") @@ -643,7 +663,8 @@ while [[ $1 ]]; do '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; '--needed') needed='1' PACOPTS+=("--needed");; '--noedit') noedit='1' ;; - '--auronly') auronly='1' ;; + '--auronly') auronly='1' ; unset noaur ;; + '--noaur') noaur='1' ; unset auronly ;; '--quickcheck') quickcheck='1' ;; '--devel') devel='1' ;; '--skipcache') skipcache='1' ;; @@ -651,6 +672,7 @@ while [[ $1 ]]; do '--skipinteg') MAKEPKGOPTS+=("--skipinteg");; '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; '--preview') preview='1' ;; + '--warn') warn='1' ;; '--') shift ; packageargs+=("$@") ; break ;; -*) pacwrap "$@" ;; *) packageargs+=("$1") ;; @@ -658,7 +680,10 @@ while [[ $1 ]]; do shift done -# check for new packages +# Determine architecture +makearch=$(grep ^CARCH= "$makepkgconf" 2>/dev/null | grep -o -e =.*[0-9A-Za-z] | sed 's/^="//'); + +# Check for new packages if [[ $quickcheck == 1 ]]; then run_quick_check exit @@ -667,6 +692,7 @@ fi # Sanity checks [[ $option ]] || option="searchinstall" [[ $option != "update" && -z $packageargs ]] && err "Must specify a package." +[[ $auronly && $noaur ]] && err "Parameters --auronly and --noaur conflict." # Install (-S) handling if [[ $option = install ]]; then @@ -684,12 +710,15 @@ if [[ $option = update ]]; then fi # Aur update - echo -e "${COLOR5}:: ${COLOR1}Synchronizing aur database...${ENDCOLOR}" - IFS=$'\n' read -rd '' -a packages < <(pacman -Qm) - newpackages=() - checkignores=() - total="${#packages[@]}" - grep -q '^ *ILoveCandy' "$pacmanconf" && bartype='candy' || bartype='normal' + total=0 + if ! [[ $noaur ]]; then + echo -e "${COLOR5}:: ${COLOR1}Synchronizing aur database...${ENDCOLOR}" + IFS=$'\n' read -rd '' -a packages < <(pacman -Qm) + newpackages=() + checkignores=() + total="${#packages[@]}" + grep -q '^ *ILoveCandy' "$pacmanconf" && bartype='candy' || bartype='normal' + fi if [[ $devel ]]; then for ((i=0; i<$total; i++)); do @@ -740,7 +769,7 @@ if [[ $option = update ]]; then fi echo - echo -e "${COLOR5}:: ${COLOR1}Starting full aur upgrade...${ENDCOLOR}" + [[ $noaur ]] || echo -e "${COLOR5}:: ${COLOR1}Starting full aur upgrade...${ENDCOLOR}" # Check and output ignored package update info for package in "${checkignores[@]}"; do @@ -754,23 +783,41 @@ if [[ $option = update ]]; then auronly='1' installhandling "${newpackages[@]}" fi - echo " local database is up to date" + [[ $noaur ]] || echo " local database is up to date" fi # Download (-G) handling if [[ $option = download ]]; then for package in "${packageargs[@]}"; do - if existsinaur "$package"; then + if ! [[ $noaur ]] && existsinaur "$package"; then pkglist+=("$package") + elif ! [[ $auronly ]] && existsinpacman "$package"; then + abslist+=("$package") + elif [[ $noaur ]]; then + err "Package \`$package' does not exist in ABS." + elif [[ $auronly ]]; then + err "Package \`$package' does not exist in AUR." else - err "Package \`$package' does not exist on aur." + err "Package \`$package' does not exist in ABS+AUR." fi done + [[ $abslist ]] && echo -e "${COLOR6}notice:$ENDCOLOR sourcing from ${COLOR4}[ABS]$ENDCOLOR" + for package in "${abslist[@]}"; do + pkgrepo=$(absrepo "$package") + abslink "$pkgrepo" "$package" + [ -d "$package" ] && rm -r "$package" + mv "$pkgrepo/$package" "$package" + rmdir "$pkgrepo" + ls "$package" | awk -v package="$package" '{print package"/"$0}' + done + + [[ $pkglist ]] && echo -e "${COLOR6}notice:$ENDCOLOR sourcing from ${COLOR3}[AUR]$ENDCOLOR" for package in "${pkglist[@]}"; do curl -Lfs "$(pkglink $package)" > "$package.tar.gz" + [ -d "$package" ] && rm -r "$package" mkdir "$package" - tar xf "$package.tar.gz" -C "$package" --strip-components=1 + tar xvf "$package.tar.gz" -C "$package" --strip-components=1 done fi @@ -797,23 +844,28 @@ if [[ $option = search || $option = searchinstall ]]; then fi # Aur searching and tmpfile preparation - for package in "${packageargs[@]}"; do - curl -LfGs --data-urlencode "arg=$package" "$RPCURL=search" | \ - jshon -Q -e results -a -e Name -u -p -e Version -u -p -e NumVotes -u -p -e Description -u | \ - sed 's/^$/-/' | paste -s -d "\t\t\t\n" | sort -nr -k 3 > "$tmpdir/$package.search" & - done - wait - cp "$tmpdir/${packageargs[0]}.search" "$tmpdir/search.results" - for ((i=1 ; i<${#packageargs[@]} ; i++)); do - grep -xFf "$tmpdir/search.results" "$tmpdir/${packageargs[$i]}.search" > "$tmpdir/search.results-2" - mv "$tmpdir/search.results-2" "$tmpdir/search.results" - done - sed -i '/^$/d' "$tmpdir/search.results" + if ! [[ $noaur ]]; then + for package in "${packageargs[@]}"; do + curl -LfGs --data-urlencode "arg=$package" "$RPCURL=search" | \ + jshon -Q -e results -a -e Name -u -p -e Version -u -p -e NumVotes -u -p -e Description -u | \ + sed 's/^$/-/' | paste -s -d "\t\t\t\n" | sort -nr -k 3 > "$tmpdir/$package.search" & + done + wait + cp "$tmpdir/${packageargs[0]}.search" "$tmpdir/search.results" + for ((i=1 ; i<${#packageargs[@]} ; i++)); do + grep -xFf "$tmpdir/search.results" "$tmpdir/${packageargs[$i]}.search" > "$tmpdir/search.results-2" + mv "$tmpdir/search.results-2" "$tmpdir/search.results" + done + sed -i '/^$/d' "$tmpdir/search.results" + + # Prepare tmp file and arrays + IFS=$'\n' read -rd '' -a aurname < <(cut -f 1 "$tmpdir/search.results") + aurtotal="${#aurname[@]}" + alltotal="$(($pactotal+$aurtotal))" + else + alltotal="$pactotal" + fi - # Prepare tmp file and arrays - IFS=$'\n' read -rd '' -a aurname < <(cut -f 1 "$tmpdir/search.results") - aurtotal="${#aurname[@]}" - alltotal="$(($pactotal+$aurtotal))" # Echo out the -Ss formatted package information IFS=$'\t\n' @@ -882,7 +934,7 @@ if [[ $option = info ]]; then results="$(sed -r "s|^[^ ][^:]*:|$S${COLOR1}&$S${ENDCOLOR}|" <<< "$results")" echo -e "$results" exit - else # Check to see if it is in the aur + elif ! [[ $noaur ]]; then # Check to see if it is in the aur pkginfo "$package" "$preview" [[ -s "$tmpdir/$package.PKGBUILD" ]] || err "${COLOR7}error:${ENDCOLOR} package '$package' was not found" . "$tmpdir/$package.PKGBUILD" @@ -918,6 +970,8 @@ if [[ $option = info ]]; then echo -e "${COLOR1}Architecture : ${ENDCOLOR}${arch[@]}" echo -e "${COLOR1}Description : ${ENDCOLOR}$pkgdesc" echo + else + err "${COLOR7}error:${ENDCOLOR} package '$package' was not found" fi done fi diff --git a/apacman.8 b/apacman.8 index 5ed4c0f..7fd25bf 100644 --- a/apacman.8 +++ b/apacman.8 @@ -51,12 +51,12 @@ Show information for a package\&. .PP \fB\-G\fR .RS 4 -Download and extract AUR package tarballs, but don\(cqt install anything\&. +Download and extract ABS and AUR package tarballs, but don\(cqt install anything\&. .RE .PP \fB\-h\fR .RS 4 -Show packer usage\&. +Show apacman usage\&. .RE .SH "OPTIONS" .PP @@ -105,6 +105,11 @@ Check for updates and exit\&. Only perform commands for the AUR\&. .RE .PP +\fB\-\-noaur\fR +.RS 4 +Do not perform commands for the AUR\&. +.RE +.PP \fB\-\-devel\fR .RS 4 Update development packages\&. (cvs, git\&...) @@ -117,7 +122,12 @@ Skip the integrity check by ignoring AUR package MD5 sums\&. .PP \fB\-\-preview\fR .RS 4 -Always offer to edit the pkgbuild before sourcing it. To always force preview, 'alias packer="packer --preview"' +Always offer to edit the pkgbuild before sourcing it\&. +.RE +.PP +\fB\-\-warn\fR +.RS 4 +Treat errors as non-fatal warnings (only enable if you are know what you are doing\&.) .RE .SH "INTERACTIVE MODE" .sp From caa3cbe696629e2e6bcc039fa08d164168730962 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Fri, 9 Jan 2015 20:06:02 -0800 Subject: [PATCH 12/32] Version 0.9 - list installed packages by size with -L option --- README.md | 9 +++++---- apacman | 54 +++++++++++++++++++++++++++++++++++------------------- apacman.8 | 9 +++++++-- 3 files changed, 47 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 07f11f4..450e2ac 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,11 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: -* **new** Built-in ABS support (-G now support ABS+AUR packages) -* **new** --noaur parameter to skip AUR packages -* **new** --warn parameter makes errors non-fatal (only enable if you know what you are doing) -* **new** run as root workaround for Pacman 4.2+ +* (**new**) Replacement for pacsysclean (-L list installed packages by size) +* (**new**) Built-in ABS support (-G now support ABS+AUR packages) +* (**new**) --noaur parameter to skip AUR packages +* (**new**) --warn parameter makes errors non-fatal (only enable if you know what you are doing) +* (**new**) run as root workaround for Pacman 4.2+ * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg * Uses AUR package cache directory if applicable diff --git a/apacman b/apacman index 68ab164..da913cf 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="0.8" +version="0.9" # Copyright OS Hazard # # New Features: @@ -9,6 +9,7 @@ version="0.8" # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * -L list installed packages by size # * --noaur do not actions for aur # * --warn treat errors as non-fatal warnings # * --needed does not install up-to-date packages @@ -94,6 +95,7 @@ usage() { echo ' -Ss|-Ssq - searches for package' echo ' -Si - outputs info for package' echo ' -G - download and extract aur tarball only' + echo ' -L - list installed packages by size' echo echo ' --needed - do not install up-to-date packages' echo ' --ignorearch - ignore a missing or incomplete architecture field' @@ -145,6 +147,13 @@ isignored() { [[ " ${ignoredpackages[@]} " =~ " $1 " ]] } +# List installed packages +getlistpackages() { + $PACMAN -Qi${pacmanarg} | grep -e "^Name " -e "^Installed Size " | \ + awk '{if ($(NF-1) ~ /^[0-9]/) printf $(NF-1); print $NF}' | paste -s -d' \n' | \ + sed -e 's/iB$//' -e 's/\.00K/K/' -e 's/\.00B/B/' | awk '{printf "%-10s %-40s\n",$2,$1}' | sort -h +} + # Tests whether $1 exists on the aur existsinaur() { rpcinfo "$1" @@ -153,24 +162,24 @@ existsinaur() { # Tests whether $1 exists in pacman existsinpacman() { - pacman -Si -- "$1" &>/dev/null + $PACMAN -Si -- "$1" &>/dev/null } # Tests whether $1 is provided in pacman, sets globally accessibly providepkg var providedinpacman() { unset providepkg - IFS=$'\n' read -rd '' -a providepkg < <(pacman -Ssq -- "^$1$") + IFS=$'\n' read -rd '' -a providepkg < <($PACMAN -Ssq -- "^$1$") [[ -n $providepkg ]] } # Tests whether $1 exists in a pacman group existsinpacmangroup() { - [[ $(pacman -Sgq "$1") ]] + [[ $($PACMAN -Sgq "$1") ]] } # Tests whether $1 exists locally existsinlocal() { - pacman -Qq -- "$1" &>/dev/null + $PACMAN -Qq -- "$1" &>/dev/null } # Scrapes the aur deps from PKGBUILDS and puts in globally available dependencies array @@ -189,7 +198,7 @@ finddeps() { pacmandeps=() aurdeps=() scrapeaurdeps "$1" - missingdeps=( $(pacman -T "${dependencies[@]}") ) + missingdeps=( $($PACMAN -T "${dependencies[@]}") ) while [[ $missingdeps ]]; do checkdeps=() for dep in "${missingdeps[@]}"; do @@ -217,7 +226,7 @@ finddeps() { for dep in "${checkdeps[@]}"; do scrapeaurdeps "$dep" for depdep in "${dependencies[@]}"; do - [[ $(pacman -T "$depdep") ]] && missingdeps+=("$depdep") + [[ $($PACMAN -T "$depdep") ]] && missingdeps+=("$depdep") done done done @@ -282,7 +291,7 @@ pkglink() { } absrepo() { - pacman -Si -- "$1" 2>/dev/null | grep ^Repository | awk '{print $NF}' | awk NR==1 + $PACMAN -Si -- "$1" 2>/dev/null | grep ^Repository | awk '{print $NF}' | awk NR==1 } # downloads source files ($1 is package repository, $2 is package name) @@ -522,7 +531,7 @@ installhandling() { # Test if aurpackages are already installed; echo warning if so for pkg in "${aurtargets[@]}"; do if existsinlocal "$pkg"; then - localversion="$(pacman -Qs "$pkg" | grep -F "local/$pkg " | cut -d ' ' -f 2)" + localversion="$($PACMAN -Qs "$pkg" | grep -F "local/$pkg " | cut -d ' ' -f 2)" if ! aurversionisnewer "$pkg" "$localversion"; then if [ "$needed" = "1" ]; then echo -e "${COLOR6}notice:$ENDCOLOR $pkg-$localversion is up to date -- skipping" @@ -584,7 +593,7 @@ installhandling() { # Install the aur packages for package in "${aurtargets[@]}"; do scrapeaurdeps "$package" - if pacman -T "${dependencies[@]}" &>/dev/null; then + if $PACMAN -T "${dependencies[@]}" &>/dev/null; then checkcache "$package" "explicit" else echo "Dependencies for \`$package' are not met, not building..." @@ -594,7 +603,7 @@ installhandling() { run_quick_check() { bigurl="https://aur.archlinux.org/rpc.php?type=multiinfo" - for p in $(pacman -Qqm); do + for p in $($PACMAN -Qqm); do bigurl="$bigurl&arg\[\]=$p" done parsed_aur="$(curl -s "$bigurl" | \ @@ -614,8 +623,8 @@ run_quick_check() { DBPath="${DBPath:-/var/lib/pacman/}" mkdir -p "$CHECKUPDATE_DB" ln -s "${DBPath}/local" "$CHECKUPDATE_DB" &> /dev/null - fakeroot pacman -Sqy --dbpath "$CHECKUPDATE_DB" &> /dev/null - pacman -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null + fakeroot $PACMAN -Sqy --dbpath "$CHECKUPDATE_DB" &> /dev/null + $PACMAN -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null } # proceed with installation prompt @@ -656,6 +665,7 @@ while [[ $1 ]]; do '-Si') option=info ;; -S*u*) option=update ; pacmanarg="$1" ;; '-G') option=download ;; + -L*) option=list ; pacmanarg="${1//-L}" ;; '-h'|'--help') usage ;; '-V'|'--version') version ;; '--quiet') quiet='1' ;; @@ -691,9 +701,15 @@ fi # Sanity checks [[ $option ]] || option="searchinstall" -[[ $option != "update" && -z $packageargs ]] && err "Must specify a package." +[[ $option != "list" && $option != "update" && -z $packageargs ]] && err "Must specify a package." [[ $auronly && $noaur ]] && err "Parameters --auronly and --noaur conflict." +# List (-L) handling +if [[ $option = list ]]; then + getlistpackages + exit +fi + # Install (-S) handling if [[ $option = install ]]; then installhandling "${packageargs[@]}" @@ -713,7 +729,7 @@ if [[ $option = update ]]; then total=0 if ! [[ $noaur ]]; then echo -e "${COLOR5}:: ${COLOR1}Synchronizing aur database...${ENDCOLOR}" - IFS=$'\n' read -rd '' -a packages < <(pacman -Qm) + IFS=$'\n' read -rd '' -a packages < <($PACMAN -Qm) newpackages=() checkignores=() total="${#packages[@]}" @@ -826,9 +842,9 @@ if [[ $option = search || $option = searchinstall ]]; then # Pacman searching if ! [[ $auronly ]]; then if [[ $quiet ]]; then - results="$(pacman -Ssq -- "${packageargs[@]}")" + results="$($PACMAN -Ssq -- "${packageargs[@]}")" else - results="$(pacman -Ss -- "${packageargs[@]}")" + results="$($PACMAN -Ss -- "${packageargs[@]}")" results="$(sed -r "s|^[^ ][^/]*/|$S${COLOR3}&$S${COLOR1}|" <<< "$results")" results="$(sed -r "s|^([^ ]+) ([^ ]+)(.*)$|\1 $S${COLOR2}\2$S${ENDCOLOR}\3|" <<< "$results")" fi @@ -837,7 +853,7 @@ if [[ $option = search || $option = searchinstall ]]; then else # interactive echo -e "$results" | fmt -"$_WIDTH" -s | nl -v 0 -w 1 -s ' ' -b 'p^[^ ]' fi | sed '/^$/d' - pacname=( $(pacman -Ssq -- "${packageargs[@]}") ) + pacname=( $($PACMAN -Ssq -- "${packageargs[@]}") ) pactotal="${#pacname[@]}" else pactotal=0 @@ -926,7 +942,7 @@ if [[ $option = info ]]; then sourcemakepkgconf for package in "${packageargs[@]}"; do if ! [[ $auronly ]] && existsinpacman "$package"; then - results="$(pacman -Si -- "$package")" + results="$($PACMAN -Si -- "$package")" results="$(sed -r "s|^(Repository[^:]*:)(.*)$|\1$S${COLOR3}\2$S${ENDCOLOR}|" <<< "$results")" results="$(sed -r "s|^(Name[^:]*:)(.*)$|\1$S${COLOR1}\2$S${ENDCOLOR}|" <<< "$results")" results="$(sed -r "s|^(Version[^:]*:)(.*)$|\1$S${COLOR2}\2$S${ENDCOLOR}|" <<< "$results")" diff --git a/apacman.8 b/apacman.8 index 7fd25bf..fead351 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 11/07/2013 +.\" Date: 01/09/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "11/07/2013" "apacman" "apacman Manual" +.TH "APACMAN" "8" "01/09/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -54,6 +54,11 @@ Show information for a package\&. Download and extract ABS and AUR package tarballs, but don\(cqt install anything\&. .RE .PP +\fB\-L\fR +.RS 4 +List installed packages by size (replacement for pacsysclean\&.) +.RE +.PP \fB\-h\fR .RS 4 Show apacman usage\&. From e78d4d072e67ee3055ea2182149ecf5a451e1a3f Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sat, 10 Jan 2015 14:30:32 -0800 Subject: [PATCH 13/32] Version 1.0 - Config file support, --config, --verbose, update manpages --- README.md | 2 + apacman | 116 ++++++++++++++++-------- apacman.8 | 78 +++++++++++----- apacman.conf.5 | 242 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 381 insertions(+), 57 deletions(-) create mode 100644 apacman.conf.5 diff --git a/README.md b/README.md index 450e2ac..e4cf500 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* (**new**) Config file support (/etc/apacman.conf) +* (**new**) Cleaned up manpages * (**new**) Replacement for pacsysclean (-L list installed packages by size) * (**new**) Built-in ABS support (-G now support ABS+AUR packages) * (**new**) --noaur parameter to skip AUR packages diff --git a/apacman b/apacman index da913cf..aa609c2 100755 --- a/apacman +++ b/apacman @@ -1,14 +1,17 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="0.9" +version="1.0" # Copyright OS Hazard # # New Features: +# * Config file support # * Built-in ABS support # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --config specify alternate config file (default: /etc/apacman.conf) +# * --verbose turns on verbose output # * -L list installed packages by size # * --noaur do not actions for aur # * --warn treat errors as non-fatal warnings @@ -35,20 +38,21 @@ version="0.9" [[ $PACMAN ]] || PACMAN="pacman" -# set tmpfile stuff, clean tmpdir -tmpdir="${TMPDIR:-/tmp}/apacmantmp-$UID" -rm -rf "$tmpdir" &>/dev/null -mkdir -p "$tmpdir" - makepkgconf='/etc/makepkg.conf' usermakepkgconf="$HOME/.makepkg.conf" pacmanconf='/etc/pacman.conf' -saveDir='/var/cache/apacman/pkg' +apacmanconf='/etc/apacman.conf' +savedir='/var/cache/apacman/pkg' RPCURL="https://aur.archlinux.org/rpc.php?type" PKGURL="https://aur.archlinux.org" ABSURL="rsync.archlinux.org" +# set tmpfile stuff, clean tmpdir +tmpdir="${TMPDIR:-/tmp}/apacmantmp-$UID" +rm -rf "$tmpdir" &>/dev/null +mkdir -p "$tmpdir" + if [[ -t 1 && ! $COLOR = "NO" ]]; then COLOR1='\e[1;39m' COLOR2='\e[1;32m' @@ -97,27 +101,50 @@ usage() { echo ' -G - download and extract aur tarball only' echo ' -L - list installed packages by size' echo - echo ' --needed - do not install up-to-date packages' - echo ' --ignorearch - ignore a missing or incomplete architecture field' - echo ' --skipcache - skips check for pre-built package in cache directory' - echo ' --cachevcs - installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs' - echo - echo ' --quiet - only output package name for searches' + echo ' --auronly - only do actions for AUR' + echo ' --config - specify alternate config file (default: /etc/apacman.conf)' + echo ' --cachevcs - installs cached VCS packages newer than AUR PKGBUILDs' + echo ' --devel - update VCS (git, svn, hg) packages during -Su' echo ' --ignore - takes a comma-separated list of packages to ignore' + echo ' --ignorearch - ignore a missing or incomplete architecture field' + echo ' --needed - do not install up-to-date packages' + echo ' --noaur - do not actions for AUR' echo ' --noconfirm - do not prompt for any confirmation' echo ' --noedit - do not prompt to edit files' + echo ' --preview - edit pkgbuild before sourcing' echo ' --quickcheck - check for updates and exit' - echo ' --auronly - only do actions for aur' - echo ' --noaur - do not actions for aur' - echo ' --devel - update devel packages during -Su' + echo ' --quiet - only output package name for searches' + echo ' --skipcache - skips check for pre-built package in cache directory' echo ' --skipinteg - when using makepkg, do not check md5s' - echo ' --preview - edit pkgbuild before sourcing' echo ' --warn - treat errors as non-fatal warnings' + echo ' -v - turns on verbose output' echo ' -V - display version' echo ' -h - outputs this message' exit } +varstatus() { + val=$(eval echo \$$1) + if [ "$val" == 1 ]; then + echo -e "${COLOR1}$1${ENDCOLOR}" | awk '{printf "%-25s %-40s\n",$1,": yes"}'; + elif [[ -r $val ]]; then + echo -e "${COLOR1}$1${ENDCOLOR} $val" | awk '{printf "%-25s %-40s\n",$1,": "$2}'; + fi +} + +infoconf() { + vars="apacmanconf tmpdir makepkgconf usermakepkgconf pacmanconf savedir" + for i in $vars; do + varstatus $i + done + + vars="auronly cachevcs ignorearch needed noaur noconfirm" + vars="$vars noedit preview quiet skipcache skipinteg warn" + for j in $vars; do + varstatus $j + done +} + # Called whenever anything needs to be run as root ($@ is the command) runasroot() { if [[ $UID -eq 0 ]]; then @@ -130,6 +157,15 @@ runasroot() { fi } +# Source apacman.conf file +sourceapacmanconf() { + [[ -r "$apacmanconf" ]] && . "$apacmanconf" + [[ noconfirm ]] && PACOPTS+=("--noconfirm") + [[ needed ]] && PACOPTS+=("--needed") + [[ skipinteg ]] && MAKEPKGOPTS+=("--skipinteg") + [[ ignorearch ]] && MAKEPKGOPTS+=("--ignorearch") +} + # Source makepkg.conf file sourcemakepkgconf() { . "$makepkgconf" @@ -347,13 +383,13 @@ confirm_edit() { # Checks if aur cache is newer than aur ($1 is package, $2 is aur version) checkvcs() { if [ "$cachevcs" = "1" ]; then - cachefile=$(ls --sort=time ${saveDir}/${1}-*-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1 | awk -F "${saveDir}/${1}-" '{print $2}'); + cachefile=$(ls --sort=time ${savedir}/${1}-*-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1 | awk -F "${savedir}/${1}-" '{print $2}'); cachever=$(echo "$cachefile" | sed "s/-any.pkg.tar.xz//g;s/-any.pkg.tar//g;s/-${makearch}.pkg.tar.xz//g;s/-${makearch}.pkg.tar//g"); if [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -gt 0 ]]; then echo -e "${COLOR7}warning:${ENDCOLOR} $pkg -- ${COLOR7}verify cache newer than AUR${ENDCOLOR} ($pkgver-$pkgrel)" - pkgfile="${saveDir}/${1}-${cachefile}"; + pkgfile="${savedir}/${1}-${cachefile}"; elif [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -eq 0 ]]; then - pkgfile="${saveDir}/${1}-${cachefile}"; + pkgfile="${savedir}/${1}-${cachefile}"; fi fi; } @@ -364,7 +400,7 @@ checkcache() { if [ "$skipcache" != "1" ]; then sourcemakepkgconf - pkgfile=$(ls ${saveDir}/${1}-${pkgver}-${pkgrel}-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1); + pkgfile=$(ls ${savedir}/${1}-${pkgver}-${pkgrel}-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1); fi if [ "$cachevcs" = "1" ]; then @@ -454,10 +490,10 @@ aurinstall() { done # Save packages - if [ ! -d $saveDir ]; then - runasroot mkdir -p $saveDir + if [ ! -d $savedir ]; then + runasroot mkdir -p $savedir fi - runasroot cp $pkgname-*$PKGEXT $saveDir/ + runasroot cp $pkgname-*$PKGEXT $savedir/ echo -e "${COLOR5} -> ${COLOR1}Saved package:$ENDCOLOR $(ls $pkgname-*$PKGEXT)"; if [[ $2 = dependency ]]; then @@ -666,23 +702,25 @@ while [[ $1 ]]; do -S*u*) option=update ; pacmanarg="$1" ;; '-G') option=download ;; -L*) option=list ; pacmanarg="${1//-L}" ;; - '-h'|'--help') usage ;; - '-V'|'--version') version ;; - '--quiet') quiet='1' ;; + '--auronly') auronly='1' ; unset noaur ;; + '--cachevcs') cachevcs='1' ;; + '--config') config='1' ; apacmanconf="$2" ; shift ;; + '--devel') devel='1' ;; '--ignore') ignorearg="$2" ; PACOPTS+=("--ignore" "$2") ; shift ;; - '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; + '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; '--needed') needed='1' PACOPTS+=("--needed");; - '--noedit') noedit='1' ;; - '--auronly') auronly='1' ; unset noaur ;; '--noaur') noaur='1' ; unset auronly ;; + '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; + '--noedit') noedit='1' ;; + '--preview') preview='1' ;; '--quickcheck') quickcheck='1' ;; - '--devel') devel='1' ;; + '--quiet') quiet='1' ;; '--skipcache') skipcache='1' ;; - '--cachevcs') cachevcs='1' ;; - '--skipinteg') MAKEPKGOPTS+=("--skipinteg");; - '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; - '--preview') preview='1' ;; + '--skipinteg') skipinteg='1' ; MAKEPKGOPTS+=("--skipinteg");; '--warn') warn='1' ;; + '-h'|'--help') usage ;; + '-v'|'--verbose') verbose='1' ;; + '-V'|'--version') version ;; '--') shift ; packageargs+=("$@") ; break ;; -*) pacwrap "$@" ;; *) packageargs+=("$1") ;; @@ -690,6 +728,9 @@ while [[ $1 ]]; do shift done +# Override defaults +sourceapacmanconf + # Determine architecture makearch=$(grep ^CARCH= "$makepkgconf" 2>/dev/null | grep -o -e =.*[0-9A-Za-z] | sed 's/^="//'); @@ -700,8 +741,11 @@ if [[ $quickcheck == 1 ]]; then fi # Sanity checks +[[ $verbose || $debug ]] && infoconf +[[ $config && -z $apacmanconf ]] && err "${COLOR7}error:${ENDCOLOR} no config file specified (use -h for help)" [[ $option ]] || option="searchinstall" -[[ $option != "list" && $option != "update" && -z $packageargs ]] && err "Must specify a package." +[[ $option != "searchinstall" && -z $packageargs ]] && err "${COLOR7}error:${ENDCOLOR} no operation specified (use -h for help)" +[[ $option != "list" && $option != "update" && -z $packageargs ]] && err "${COLOR7}error:${ENDCOLOR} must specify a package." [[ $auronly && $noaur ]] && err "Parameters --auronly and --noaur conflict." # List (-L) handling diff --git a/apacman.8 b/apacman.8 index fead351..ada47cd 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 01/09/2015 +.\" Date: 01/10/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "01/09/2015" "apacman" "apacman Manual" +.TH "APACMAN" "8" "01/10/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -61,23 +61,23 @@ List installed packages by size (replacement for pacsysclean\&.) .PP \fB\-h\fR .RS 4 -Show apacman usage\&. +Show apacman version\&. .RE -.SH "OPTIONS" .PP -\fB\-\-needed\fR +\fB\-h\fR .RS 4 -Does not install up-to-date packages\&. +Show apacman usage\&. .RE +.SH "OPTIONS" .PP -\fB\-\-ignorearch\fR +\fB\-\-auronly\fR .RS 4 -ignores architectures specified in PKGBUILD\&. +Only perform commands for the AUR\&. .RE .PP -\fB\-\-skipcache\fR +\fB\-\-config\fR <\'file\'> .RS 4 -skips check for pre-built package in cache directory\&. +Use alternate configuration file\&. .RE .PP \fB\-\-cachevcs\fR @@ -85,11 +85,31 @@ skips check for pre-built package in cache directory\&. installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs\&. .RE .PP +\fB\-\-devel\fR +.RS 4 +Update development packages\&. (cvs, git\&...) +.RE +.PP \fB\-\-ignore\fR <\'package\'> .RS 4 Ignore packages\&. Separate package names with a comma\&. .RE .PP +\fB\-\-ignorearch\fR +.RS 4 +ignores architectures specified in PKGBUILD\&. +.RE +.PP +\fB\-\-needed\fR +.RS 4 +Does not install up-to-date packages\&. +.RE +.PP +\fB\-\-noaur\fR +.RS 4 +Do not perform commands for the AUR\&. +.RE +.PP \fB\-\-noconfirm\fR .RS 4 Perform commands without confirmation from the user\&. @@ -100,24 +120,24 @@ Perform commands without confirmation from the user\&. Perform commands without asking if the user wants to edit any installation files\&. .RE .PP -\fB\-\-quickcheck\fR +\fB\-\-preview\fR .RS 4 -Check for updates and exit\&. +Always offer to edit the pkgbuild before sourcing it\&. .RE .PP -\fB\-\-auronly\fR +\fB\-\-quickcheck\fR .RS 4 -Only perform commands for the AUR\&. +Check for updates and exit\&. .RE .PP -\fB\-\-noaur\fR +\fB\-\-quiet\fR .RS 4 -Do not perform commands for the AUR\&. +Turn off package descriptions\&. .RE .PP -\fB\-\-devel\fR +\fB\-\-skipcache\fR .RS 4 -Update development packages\&. (cvs, git\&...) +skips check for pre-built package in cache directory\&. .RE .PP \fB\-\-skipinteg\fR @@ -125,9 +145,9 @@ Update development packages\&. (cvs, git\&...) Skip the integrity check by ignoring AUR package MD5 sums\&. .RE .PP -\fB\-\-preview\fR +\fB\-\-verbose\fR .RS 4 -Always offer to edit the pkgbuild before sourcing it\&. +Show enabled options\&. .RE .PP \fB\-\-warn\fR @@ -250,7 +270,20 @@ To manually edit files, packer uses the EDITOR variable\&. If EDITOR is not set .sp Packages are built in the TMPDIR path\&. If the TMPDIR variable is not set then the default path is /tmp .sp -apacman uses these settings in /etc/pacman\&.conf: +Default configuration file: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +/etc/apacman\&.conf +.RE +.sp +These settings are used from /etc/pacman\&.conf: .sp .RS 4 .ie n \{\ @@ -264,9 +297,12 @@ IgnorePkg .RE .SH "SEE ALSO" .sp +\fBapacman.conf\fR(5) +.sp \fBpacman\fR(8) .sp \fBpacker\fR(8) + .SH "AUTHORS" .sp OS Hazard diff --git a/apacman.conf.5 b/apacman.conf.5 new file mode 100644 index 0000000..84c6267 --- /dev/null +++ b/apacman.conf.5 @@ -0,0 +1,242 @@ +'\" t +.\" Title: apacman.conf +.\" Author: [see the "Authors" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 01/10/2015 +.\" Manual: apacman Manual +.\" Source: apacman +.\" Language: English +.\" +.TH "APACMAN\&.CONF" "5" "01/10/2015" "apacman" "apacman Manual" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +apacman.conf \- apacman AUR wrapper optional configuration file +.SH "SYNOPSIS" +.sp +/etc/apacman\&.conf +.SH "DESCRIPTION" +.sp +apacman will attempt to read apacman\&.conf each time it is run\&. + +.SH "EXAMPLE" +.sp +.if n \{\ +.RS 4 +.\} +.nf +# +# /etc/apacman\&.conf +# +noedit=1 +skipcache=1 +savedir="/var/cache/apacman/pkg" + +.fi +.if n \{\ +.RE +.\} +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +.sp +Flags must be set equal to 1\&. No spaces are allowed\&. +Each option must be lowercase (except for URLs and colors which must be UPPERCASE)\&. +.sp .5v + +.SH "OPTIONS" +.PP +\fBauronly =\fR 1 +.RS 4 +Only do actions for AUR\&. +.RE +.PP +\fBcachevcs =\fR 1 +.RS 4 +Installs cached VCS packages if newer than AUR PKGBUILD versions\&. +.RE +.PP +\fBignorearch =\fR 1 +.RS 4 +Ignore missing architecture in PKGBUILD (mostly for ARM systems)\&. +.RE +.PP +\fBneeded =\fR 1 +.RS 4 +Do not install up-to-date packages\&. +.RE +.PP +\fBnoconfirm =\fR 1 +.RS 4 +Do not prompt for any confirmation\&. +.RE +.PP +\fBnoedit =\fR 1 +.RS 4 +Do not prompt to edit files with EDITOR\&. +.RE +.PP +\fBnoaur =\fR 1 +.RS 4 +Do no actions for AUR (hint: useful with --warn)\&. +.RE +.PP +\fBpreview =\fR 1 +.RS 4 +Prompt to edit PKGBUILD and .install before building\&. +.RE +.PP +\fBquiet =\fR 1 +.RS 4 +Do not show packages descriptions in search\&. +.RE +.PP +\fBskipcache =\fR 1 +.RS 4 +Do not install from pre-built packages in cache directory\&. +.RE +.PP +\fBskipinteg =\fR 1 +.RS 4 +Ignore missing or invalid source file hashes\&. +.RE +.PP +\fBwarn =\fR 1 +.RS 4 +Do not exit on errors, treat as non-fatal warnings\&. +.RE + +.SH "CONFIGURATION" +.PP +\fBtmpdir =\fR path/to/temp/dir +.RS 4 +Overrides the default temporary directory for apacman to build packages in\&. A tmpfs (RAM disk) directory is recommended\&. Directory must be "owned" by user\&. +.sp .5v +\fBDefault\fR: /tmp/apacmantmp-$UID +.sp .5v +\fBNOTE\fR: \fIroot\fR builds packages as \fIaurbuild\fR user\&. +.RE +.PP +\fBmakepkgconf =\fR path/to/makepkg.conf +.RS 4 +Overrides the default location of the global makepkg configuration file\&. +.sp .5v +\fBDefault\fR: /etc/makepkg.conf +.RE +.PP +\fBusermakepkgconf =\fR path/to/.makepkg.conf +.RS 4 +Overrides the global makepkg.conf with a user makepkg configuration file\&. +.sp .5v +\fBDefault\fR: $HOME/.makepkg.conf +.RE +.PP +\fBpacmanconf =\fR path/to/pacman.conf +.RS 4 +Overrides the default location of the global pacman configuration file\&. +.sp .5v +\fBDefault\fR: /etc/pacman.conf +.RE +.PP +\fBsavedir =\fR path/to/cache/dir +.RS 4 +Overrides the default location of the package cache directory\&. +.sp .5v +\fBDefault\fR: /var/cache/apacman/pkg +.RE +.PP +\fBRPCURL =\fR url/to/AUR/Search +.RS 4 +Overrides the URL address to the Arch User Repository's RPC-interface API\&. +.sp .5v +\fBDefault\fR: https://aur.archlinux.org/rpc.php?type +.RE +.PP +\fBPKGURL =\fR url/to/AUR/PKGBUILDs +.RS 4 +Overrides the URL address prefix to the Arch User Repository's PKBUILDs\&. +.sp .5v +\fBDefault\fR: https://aur.archlinux.org +.RE + +.SH "COLORS" +.sp +Use apacman with colorization if your terminal supports it\&. +.PP +\fBCOLOR1 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the bold color\&. +.sp .5v +\fBDefault\fR: '\\e[1;39m' (\fBdefault\fR) +.RE +.PP +\fBCOLOR2 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the version color\&. +.sp .5v +\fBDefault\fR: '\\e[1;32m' (\fBgreen\fR) +.RE +.PP +\fBCOLOR3 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the repository color\&. +.sp .5v +\fBDefault\fR: '\\e[1;35m' (\fBpurple\fR) +.RE +.PP +\fBCOLOR4 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the URL color\&. +.sp .5v +\fBDefault\fR: '\\e[1;36m' (\fBturqoise\fR) +.RE +.PP +\fBCOLOR5 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the attention color\&. +.sp .5v +\fBDefault\fR: '\\e[1;34m' (\fBblue\fR) +.RE +.PP +\fBCOLOR6 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the warning color\&. +.sp .5v +\fBDefault\fR: '\\e[1;33m' (\fByellow\fR) +.RE +.PP +\fBCOLOR7 =\fR [\fIescape\fR] [\fIformat\fR] [\fIcolor\fR] +.RS 4 +Overrides the error color\&. +.sp .5v +\fBDefault\fR: '\\e[1;31m' (\fBred\fR) +.RE + +.SH "SEE ALSO" +.sp +\fBapacman\fR(8) +.sp +\fBpacman.conf\fR(5) +.sp +\fBmakepkg.conf\fR(5) + +.SH "AUTHORS" +.sp +OS Hazard From bd6459e38c9abc2ee0d8bdee2136be243c2f9ec8 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sat, 10 Jan 2015 14:39:49 -0800 Subject: [PATCH 14/32] Add default conf file --- apacman.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 apacman.conf diff --git a/apacman.conf b/apacman.conf new file mode 100644 index 0000000..9ecf46a --- /dev/null +++ b/apacman.conf @@ -0,0 +1,46 @@ +# +# /etc/apacman.conf +# +# See the apacman.conf(5) manpage for options + +# +# GENERAL OPTIONS +# + +#auronly=1 +#cachevcs=1 +#ignorearch=1 +#needed=1 +#noconfirm=1 +#noedit=1 +#noaur=1 +#preview=1 +#quiet=1 +#skipcache=1 +#skipinteg=1 +#warn=1 + +# +# CONFIGURATION +# + +#tmpdir="/tmp/apacmantmp-$UID" +#makepkgconf="/etc/makepkg.conf" +#usermakepkgconf="$HOME/.makepkg.conf" +#pacmanconf="/etc/pacman.conf" +#savedir="/var/cache/apacman/pkg" +#RPCURL="https://aur.archlinux.org/rpc.php?type" +#PKGURL="https://aur.archlinux.org" +#ABSURL="rsync.archlinux.org" + +# +# COLORIZATION +# + +#COLOR1='\e[1;39m' +#COLOR2='\e[1;32m' +#COLOR3='\e[1;35m' +#COLOR4='\e[1;36m' +#COLOR5='\e[1;34m' +#COLOR6='\e[1;33m' +#COLOR7='\e[1;31m' From 768d12e86030670a3bb44241e9b786b62c54a2ce Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sun, 11 Jan 2015 15:31:50 -0800 Subject: [PATCH 15/32] Version 1.1 - minor bug fixes --- apacman | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apacman b/apacman index aa609c2..21e9497 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.0" +version="1.1" # Copyright OS Hazard # # New Features: @@ -160,10 +160,10 @@ runasroot() { # Source apacman.conf file sourceapacmanconf() { [[ -r "$apacmanconf" ]] && . "$apacmanconf" - [[ noconfirm ]] && PACOPTS+=("--noconfirm") - [[ needed ]] && PACOPTS+=("--needed") - [[ skipinteg ]] && MAKEPKGOPTS+=("--skipinteg") - [[ ignorearch ]] && MAKEPKGOPTS+=("--ignorearch") + [[ $noconfirm ]] && PACOPTS+=("--noconfirm") + [[ $needed ]] && PACOPTS+=("--needed") + [[ $skipinteg ]] && MAKEPKGOPTS+=("--skipinteg") + [[ $ignorearch ]] && MAKEPKGOPTS+=("--ignorearch") } # Source makepkg.conf file @@ -449,7 +449,7 @@ aurinstall() { cp "$tmpdir/$1.PKGBUILD" PKGBUILD fi # customizepkg - if [[ -f "/etc/customizepkg.d/$1" ]] && type -t customizepkg &>/dev/null; then + if [[ -f "/etc/customizepkg.d/$1" ]] && deptest customizepkg; then echo "Applying customizepkg instructions..." customizepkg --modify fi @@ -744,7 +744,6 @@ fi [[ $verbose || $debug ]] && infoconf [[ $config && -z $apacmanconf ]] && err "${COLOR7}error:${ENDCOLOR} no config file specified (use -h for help)" [[ $option ]] || option="searchinstall" -[[ $option != "searchinstall" && -z $packageargs ]] && err "${COLOR7}error:${ENDCOLOR} no operation specified (use -h for help)" [[ $option != "list" && $option != "update" && -z $packageargs ]] && err "${COLOR7}error:${ENDCOLOR} must specify a package." [[ $auronly && $noaur ]] && err "Parameters --auronly and --noaur conflict." From 3ea7d1a1fd4ddf0ac1d6201243533f46d6b23556 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 14 Jan 2015 22:16:09 -0800 Subject: [PATCH 16/32] Version 1.2 - Install checkdepends, --purgebuild to remove makedeps, --skiptest to avoid checkdeps --- README.md | 2 ++ apacman | 19 +++++++++++++++++-- apacman.8 | 14 ++++++++++++-- apacman.conf | 2 ++ apacman.conf.5 | 14 ++++++++++++-- apacman.install | 4 +--- 6 files changed, 46 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e4cf500..cf5b428 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* (**new**) --purgebuild parameter to remove unneeded build depends +* (**new**) --skiptest to avoid installing unit test packages * (**new**) Config file support (/etc/apacman.conf) * (**new**) Cleaned up manpages * (**new**) Replacement for pacsysclean (-L list installed packages by size) diff --git a/apacman b/apacman index 21e9497..abf70a9 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.1" +version="1.2" # Copyright OS Hazard # # New Features: @@ -10,6 +10,8 @@ version="1.1" # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --purgebuild remove unneeded build dependencies +# * --skiptest skips installing check() unit test packages # * --config specify alternate config file (default: /etc/apacman.conf) # * --verbose turns on verbose output # * -L list installed packages by size @@ -112,10 +114,12 @@ usage() { echo ' --noconfirm - do not prompt for any confirmation' echo ' --noedit - do not prompt to edit files' echo ' --preview - edit pkgbuild before sourcing' + echo ' --purgebuild - remove unneeded build dependencies' echo ' --quickcheck - check for updates and exit' echo ' --quiet - only output package name for searches' echo ' --skipcache - skips check for pre-built package in cache directory' echo ' --skipinteg - when using makepkg, do not check md5s' + echo ' --skiptest - when using makepkg, do not parse check() test deps' echo ' --warn - treat errors as non-fatal warnings' echo ' -v - turns on verbose output' echo ' -V - display version' @@ -162,6 +166,7 @@ sourceapacmanconf() { [[ -r "$apacmanconf" ]] && . "$apacmanconf" [[ $noconfirm ]] && PACOPTS+=("--noconfirm") [[ $needed ]] && PACOPTS+=("--needed") + [[ $skiptest ]] && MAKEPKGOPTS+=("--nocheck") [[ $skipinteg ]] && MAKEPKGOPTS+=("--skipinteg") [[ $ignorearch ]] && MAKEPKGOPTS+=("--ignorearch") } @@ -222,8 +227,10 @@ existsinlocal() { scrapeaurdeps() { pkginfo "$1" "$preview" . "$tmpdir/$1.PKGBUILD" + [[ $skiptest = 1 ]] && unset checkdepends IFS=$'\n' - dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}" | sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) ) + dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}\n${checkdepends[*]}" | sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) ) + purgedepends=( $(echo -e "${makedepends[*]}\n${checkdepends[*]}" | sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) ) unset IFS } @@ -234,6 +241,7 @@ finddeps() { pacmandeps=() aurdeps=() scrapeaurdeps "$1" + [[ $purgebuild = 1 ]] && purgedeps+=("${purgedepends[@]}") missingdeps=( $($PACMAN -T "${dependencies[@]}") ) while [[ $missingdeps ]]; do checkdeps=() @@ -635,6 +643,11 @@ installhandling() { echo "Dependencies for \`$package' are not met, not building..." fi done + + # Remove build dependencies + if [[ $purgedeps ]]; then + runasroot $PACMAN --noconfirm -R -- "${purgedeps[@]}" + fi } run_quick_check() { @@ -713,10 +726,12 @@ while [[ $1 ]]; do '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; '--noedit') noedit='1' ;; '--preview') preview='1' ;; + '--purgebuild') purgebuild='1' ;; '--quickcheck') quickcheck='1' ;; '--quiet') quiet='1' ;; '--skipcache') skipcache='1' ;; '--skipinteg') skipinteg='1' ; MAKEPKGOPTS+=("--skipinteg");; + '--skiptest') skiptest='1' ; MAKEPKGOPTS+=("--nocheck");; '--warn') warn='1' ;; '-h'|'--help') usage ;; '-v'|'--verbose') verbose='1' ;; diff --git a/apacman.8 b/apacman.8 index ada47cd..d52ff5f 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 01/10/2015 +.\" Date: 01/14/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "01/10/2015" "apacman" "apacman Manual" +.TH "APACMAN" "8" "01/14/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -125,6 +125,11 @@ Perform commands without asking if the user wants to edit any installation files Always offer to edit the pkgbuild before sourcing it\&. .RE .PP +\fB\-\-purgebuild\fR +.RS 4 +Post\-install remove unneeded build makedepends\&. +.RE +.PP \fB\-\-quickcheck\fR .RS 4 Check for updates and exit\&. @@ -145,6 +150,11 @@ skips check for pre-built package in cache directory\&. Skip the integrity check by ignoring AUR package MD5 sums\&. .RE .PP +\fB\-\-skiptest\fR +.RS 4 +Avoid install of check unit test packages\&. +.RE +.PP \fB\-\-verbose\fR .RS 4 Show enabled options\&. diff --git a/apacman.conf b/apacman.conf index 9ecf46a..5941a23 100644 --- a/apacman.conf +++ b/apacman.conf @@ -15,9 +15,11 @@ #noedit=1 #noaur=1 #preview=1 +#purgebuild=1 #quiet=1 #skipcache=1 #skipinteg=1 +#skiptest=1 #warn=1 # diff --git a/apacman.conf.5 b/apacman.conf.5 index 84c6267..0852a61 100644 --- a/apacman.conf.5 +++ b/apacman.conf.5 @@ -2,12 +2,12 @@ .\" Title: apacman.conf .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 01/10/2015 +.\" Date: 01/14/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN\&.CONF" "5" "01/10/2015" "apacman" "apacman Manual" +.TH "APACMAN\&.CONF" "5" "01/14/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -103,6 +103,11 @@ Do no actions for AUR (hint: useful with --warn)\&. Prompt to edit PKGBUILD and .install before building\&. .RE .PP +\fBpurgebuild =\fR 1 +.RS 4 +Remove unneeded build dependencies\&. +.RE +.PP \fBquiet =\fR 1 .RS 4 Do not show packages descriptions in search\&. @@ -118,6 +123,11 @@ Do not install from pre-built packages in cache directory\&. Ignore missing or invalid source file hashes\&. .RE .PP +\fBskiptest =\fR 1 +.RS 4 +Do not install unit test packages\&. +.RE +.PP \fBwarn =\fR 1 .RS 4 Do not exit on errors, treat as non-fatal warnings\&. diff --git a/apacman.install b/apacman.install index 7d3558d..39951dd 100644 --- a/apacman.install +++ b/apacman.install @@ -5,9 +5,7 @@ post_install(){ } post_upgrade() { - echo "==> Must install apacman-deps meta package to compile packages from AUR" - echo "==> Remove build depends with: pacman -Rss apacman-deps" - id aurbuild >/dev/null 2>/dev/null || useradd -r -d /var/empty aurbuild + post_install } post_remove() { From 669407d3ec5c85b42fe6c2ff4cc0bae2f21db030 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Thu, 15 Jan 2015 15:04:03 -0800 Subject: [PATCH 17/32] Add check for new flags to verbose --- apacman | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apacman b/apacman index abf70a9..64ea30f 100755 --- a/apacman +++ b/apacman @@ -142,8 +142,8 @@ infoconf() { varstatus $i done - vars="auronly cachevcs ignorearch needed noaur noconfirm" - vars="$vars noedit preview quiet skipcache skipinteg warn" + vars="auronly cachevcs ignorearch needed noaur noconfirm noedit preview" + vars="$vars purgebuild quiet skipcache skipinteg skiptest warn" for j in $vars; do varstatus $j done From 23020acae25393016866f2a71d9e405a2d73c9b6 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sat, 7 Feb 2015 21:07:51 -0800 Subject: [PATCH 18/32] Version 1.3 - Bug fixes, --buildonly, --nofail, build status, EDITOR --- README.md | 21 +++--- apacman | 190 +++++++++++++++++++++++++++++++++++-------------- apacman.8 | 16 ++++- apacman.conf | 6 +- apacman.conf.5 | 32 +++++++-- 5 files changed, 195 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index cf5b428..c35b672 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,20 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* (**new**) Bug fix for pacmatic +* (**new**) Build status log +* (**new**) Override EDITOR for PKGBUILDs in config file +* (**new**) --buildonly parameter to build but not AUR install packages +* (**new**) --nofail parameter to quit if a package does not build * (**new**) --purgebuild parameter to remove unneeded build depends -* (**new**) --skiptest to avoid installing unit test packages -* (**new**) Config file support (/etc/apacman.conf) -* (**new**) Cleaned up manpages -* (**new**) Replacement for pacsysclean (-L list installed packages by size) -* (**new**) Built-in ABS support (-G now support ABS+AUR packages) -* (**new**) --noaur parameter to skip AUR packages -* (**new**) --warn parameter makes errors non-fatal (only enable if you know what you are doing) -* (**new**) run as root workaround for Pacman 4.2+ +* --skiptest to avoid installing unit test packages +* Config file support (/etc/apacman.conf) +* Cleaned up manpages +* Replacement for pacsysclean (-L list installed packages by size) +* -G now supports ABS + AUR packages +* --noaur parameter to skip AUR packages +* --warn parameter makes errors non-fatal (only enable if you know what you are doing) +* Run as root workaround for Pacman 4.2+ * All features from packer * Saves built AUR packages to /var/cache/apacman/pkg * Uses AUR package cache directory if applicable diff --git a/apacman b/apacman index 64ea30f..42d63ab 100755 --- a/apacman +++ b/apacman @@ -1,15 +1,17 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.2" +version="1.3" # Copyright OS Hazard # # New Features: # * Config file support -# * Built-in ABS support +# * Built-in ABS support (WIP) # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --buildonly create but do not install packages +# * --nofail do not continue if a package fails to build # * --purgebuild remove unneeded build dependencies # * --skiptest skips installing check() unit test packages # * --config specify alternate config file (default: /etc/apacman.conf) @@ -21,7 +23,7 @@ version="1.2" # * --ignorearch ignores architectures specified in PKGBUILD # * --skipcache skips check for pre-built package in cache directory # * --cachevcs installs cached VCS (git, svn, hg) packages newer than AUR PKGBUILDs -# * partial passthrough for -R, -Q, and -U parameters +# * partial passthrough for -R, -Q, -T and -U parameters ###################################################################### # Copyright Matthew Bruenig @@ -39,13 +41,18 @@ version="1.2" # along with this program. If not, see . [[ $PACMAN ]] || PACMAN="pacman" +pacmanbin="/usr/bin/pacman" makepkgconf='/etc/makepkg.conf' usermakepkgconf="$HOME/.makepkg.conf" pacmanconf='/etc/pacman.conf' apacmanconf='/etc/apacman.conf' +downdir='/var/cache/pacman/pkg' savedir='/var/cache/apacman/pkg' +editor="vi" +[[ $EDITOR ]] && editor="$EDITOR" + RPCURL="https://aur.archlinux.org/rpc.php?type" PKGURL="https://aur.archlinux.org" ABSURL="rsync.archlinux.org" @@ -79,12 +86,16 @@ err() { [[ "$warn" == 1 ]] || exit 1 } +invalid() { + echo -e "${COLOR7}error:${ENDCOLOR} invalid option \`$1'" +} + deptest() { type -p $1 &>/dev/null } version() { - pacver=$($PACMAN -V 2>/dev/null | grep -o "Pacman v.*") + pacver=$($pacmanbin -V 2>/dev/null | grep -o "Pacman v.*") echo " === = = ===== apacman v${version} - forked from packer" echo " = = = = = = ${pacver}" echo ' ===== = = ====' @@ -104,6 +115,7 @@ usage() { echo ' -L - list installed packages by size' echo echo ' --auronly - only do actions for AUR' + echo ' --buildonly - create but do not install packages' echo ' --config - specify alternate config file (default: /etc/apacman.conf)' echo ' --cachevcs - installs cached VCS packages newer than AUR PKGBUILDs' echo ' --devel - update VCS (git, svn, hg) packages during -Su' @@ -113,6 +125,7 @@ usage() { echo ' --noaur - do not actions for AUR' echo ' --noconfirm - do not prompt for any confirmation' echo ' --noedit - do not prompt to edit files' + echo ' --nofail - do not continue if a package fails to build' echo ' --preview - edit pkgbuild before sourcing' echo ' --purgebuild - remove unneeded build dependencies' echo ' --quickcheck - check for updates and exit' @@ -137,13 +150,13 @@ varstatus() { } infoconf() { - vars="apacmanconf tmpdir makepkgconf usermakepkgconf pacmanconf savedir" + vars="apacmanconf downdir editor makepkgconf pacmanconf savedir tmpdir usermakepkgconf" for i in $vars; do varstatus $i done - vars="auronly cachevcs ignorearch needed noaur noconfirm noedit preview" - vars="$vars purgebuild quiet skipcache skipinteg skiptest warn" + vars="auronly buildonly cachevcs ignorearch needed noaur noconfirm noedit" + vars="$vars nofail preview purgebuild quiet skipcache skipinteg skiptest warn" for j in $vars; do varstatus $j done @@ -190,7 +203,7 @@ isignored() { # List installed packages getlistpackages() { - $PACMAN -Qi${pacmanarg} | grep -e "^Name " -e "^Installed Size " | \ + $pacmanbin -Qi${pacmanarg} | grep -e "^Name " -e "^Installed Size " | \ awk '{if ($(NF-1) ~ /^[0-9]/) printf $(NF-1); print $NF}' | paste -s -d' \n' | \ sed -e 's/iB$//' -e 's/\.00K/K/' -e 's/\.00B/B/' | awk '{printf "%-10s %-40s\n",$2,$1}' | sort -h } @@ -203,24 +216,24 @@ existsinaur() { # Tests whether $1 exists in pacman existsinpacman() { - $PACMAN -Si -- "$1" &>/dev/null + $pacmanbin -Si -- "$1" &>/dev/null } # Tests whether $1 is provided in pacman, sets globally accessibly providepkg var providedinpacman() { unset providepkg - IFS=$'\n' read -rd '' -a providepkg < <($PACMAN -Ssq -- "^$1$") + IFS=$'\n' read -rd '' -a providepkg < <($pacmanbin -Ssq -- "^$1$") [[ -n $providepkg ]] } # Tests whether $1 exists in a pacman group existsinpacmangroup() { - [[ $($PACMAN -Sgq "$1") ]] + [[ $($pacmanbin -Sgq "$1") ]] } # Tests whether $1 exists locally existsinlocal() { - $PACMAN -Qq -- "$1" &>/dev/null + $pacmanbin -Qq -- "$1" &>/dev/null } # Scrapes the aur deps from PKGBUILDS and puts in globally available dependencies array @@ -241,8 +254,8 @@ finddeps() { pacmandeps=() aurdeps=() scrapeaurdeps "$1" - [[ $purgebuild = 1 ]] && purgedeps+=("${purgedepends[@]}") - missingdeps=( $($PACMAN -T "${dependencies[@]}") ) + [[ $buildonly = 1 || $purgebuild = 1 ]] && purgedeps+=( $($pacmanbin -T "${purgedepends[@]}") ) + missingdeps=( $($pacmanbin -T "${dependencies[@]}") ) while [[ $missingdeps ]]; do checkdeps=() for dep in "${missingdeps[@]}"; do @@ -270,7 +283,7 @@ finddeps() { for dep in "${checkdeps[@]}"; do scrapeaurdeps "$dep" for depdep in "${dependencies[@]}"; do - [[ $($PACMAN -T "$depdep") ]] && missingdeps+=("$depdep") + [[ $($pacmanbin -T "$depdep") ]] && missingdeps+=("$depdep") done done done @@ -335,7 +348,7 @@ pkglink() { } absrepo() { - $PACMAN -Si -- "$1" 2>/dev/null | grep ^Repository | awk '{print $NF}' | awk NR==1 + $pacmanbin -Si -- "$1" 2>/dev/null | grep ^Repository | awk '{print $NF}' | awk NR==1 } # downloads source files ($1 is package repository, $2 is package name) @@ -353,7 +366,7 @@ pkginfo() { if [[ $2 ]]; then # rename for syntax highlighting cp "$tmpdir/$1.PKGBUILD" "$tmpdir/PKGBUILD" - confirm_edit "${COLOR6}Edit $1 PKGBUILD with \$EDITOR? [Y/n]${ENDCOLOR} " "$tmpdir/PKGBUILD" + confirm_edit "${COLOR6}Edit $1 PKGBUILD with \$editor? [Y/n]${ENDCOLOR} " "$tmpdir/PKGBUILD" mv "$tmpdir/PKGBUILD" "$tmpdir/$1.PKGBUILD" fi fi @@ -377,6 +390,14 @@ isoutofdate() { [[ "$(jshon -Q -e results -e OutOfDate -u < "$tmpdir/$1.info")" = "1" ]] } +# List bundle package files +listbundle() { + if [[ $bundle ]]; then + echo -e "${COLOR5}==>${ENDCOLOR} Packages to bundle" + echo ${bundle[@]} | sed 's/ /\n/g' | tee "$tmpdir/bundle.lst" + fi +} + # $1 is prompt, $2 is file confirm_edit() { if [[ (! -f "$2") || "$noconfirm" || "$noedit" ]]; then @@ -384,7 +405,35 @@ confirm_edit() { fi echo -en "$1" if proceed; then - ${EDITOR:-vi} "$2" + $editor "$2" + fi +} + +# Output status of aur packages ($1 is 0 for success or 1 for failure) +buildstatus() { + if [[ $1 != 0 ]]; then + echo + echo -e "${COLOR7}==> ERROR:${ENDCOLOR} ${COLOR1}the build failed${ENDCOLOR}" + fi + + echo -ne "${COLOR5} ->${ENDCOLOR} ${COLOR1}Status${ENDCOLOR}" + [[ $success ]] && echo -ne "\t${COLOR4}built (${#success[@]}):${ENDCOLOR} $success" + [[ $failure ]] && echo -ne "\t${COLOR7}failed (${#failure[@]}):${ENDCOLOR} $failure" + echo "" + + [[ $nofail = 1 && $1 != 0 ]] && exit 1 +} + +# Build install ($1 is package filename, $2 is dependency or explicit, $3 is package) +buildinstall() { + if [[ $2 = dependency ]]; then + runasroot $PACMAN ${PACOPTS[@]} --asdeps -U "$1" + [[ $buildonly = 1 ]] && bundle+=("$1") + [[ $buildonly = 1 ]] && purgedeps+=("$3") + elif [[ $2 = explicit ]]; then + [[ $buildonly = 1 ]] && echo -e "${COLOR6}notice:${ENDCOLOR} $3 built -- not installing" + [[ $buildonly = 1 ]] && bundle+=("$1") + [[ $buildonly != 1 ]] && runasroot $PACMAN ${PACOPTS[@]} -U "$1" fi } @@ -422,18 +471,17 @@ checkcache() { fi; } +# Installs packages from cache ($1 is package filename, $2 is dependency or explicit) cacheinstall() { if [ "$cachevcs" = "1" ]; then - echo -e "${COLOR6}notice:$ENDCOLOR installing $pkg-$cachever from cache" + pkgrelease="$pkg-$cachever" else - echo -e "${COLOR6}notice:$ENDCOLOR installing $pkg-$pkgver-$pkgrel from cache" + pkgrelease="$pkg-$pkgver-$pkgrel" fi - if [[ $2 = dependency ]]; then - runasroot $PACMAN ${PACOPTS[@]} --asdeps -U "$1" - elif [[ $2 = explicit ]]; then - runasroot $PACMAN ${PACOPTS[@]} -U "$1" - fi + echo -e "${COLOR6}notice:$ENDCOLOR installing $pkgrelease from cache" + pkgfilename=$(ls ${savedir}/$pkgrelease-*$PKGEXT) + buildinstall $pkgfilename $2 $pkg } # Installs packages from aur ($1 is package, $2 is dependency or explicit) @@ -471,7 +519,7 @@ aurinstall() { fi # Allow user to edit PKGBUILD - confirm_edit "${COLOR6}Edit $1 PKGBUILD with \$EDITOR? [Y/n]${ENDCOLOR} " PKGBUILD + confirm_edit "${COLOR6}Edit $1 PKGBUILD with \$editor? [Y/n]${ENDCOLOR} " PKGBUILD if ! [[ -f PKGBUILD ]]; then err "No PKGBUILD found in directory." fi @@ -479,7 +527,7 @@ aurinstall() { # Allow user to edit .install unset install . PKGBUILD - confirm_edit "${COLOR6}Edit $install with \$EDITOR? [Y/n]${ENDCOLOR} " "$install" + confirm_edit "${COLOR6}Edit $install with \$editor? [Y/n]${ENDCOLOR} " "$install" # Installation (makepkg and pacman) rm -f *$PKGEXT @@ -491,23 +539,28 @@ aurinstall() { makepkg $MAKEPKGOPTS -f fi - [[ $? -ne 0 ]] && echo "The build failed." && return 1 + # Build check + if [[ $? -ne 0 ]]; then + failure+=("$1") + buildstatus 1 + else + success+=("$1") + buildstatus 0 + fi + pkgtarfiles="" for i in "${pkgname[@]}"; do pkgtarfiles="$pkgtarfiles $i-*$PKGEXT" done # Save packages - if [ ! -d $savedir ]; then - runasroot mkdir -p $savedir - fi - runasroot cp $pkgname-*$PKGEXT $savedir/ - echo -e "${COLOR5} -> ${COLOR1}Saved package:$ENDCOLOR $(ls $pkgname-*$PKGEXT)"; - - if [[ $2 = dependency ]]; then - runasroot $PACMAN ${PACOPTS[@]} --asdeps -U $pkgtarfiles - elif [[ $2 = explicit ]]; then - runasroot $PACMAN ${PACOPTS[@]} -U $pkgtarfiles + pkgtar=$(ls $pkgname-*$PKGEXT 2>/dev/null | tail -n 1) + if [[ $pkgtar ]]; then + [ -d $savedir ] || runasroot mkdir -p $savedir + runasroot cp $pkgname-*$PKGEXT $savedir/ + echo -e "${COLOR5} -> ${COLOR1}Saved package:${ENDCOLOR} $(ls $pkgname-*$PKGEXT)"; + pkgfilename=$(ls $pkgname-*$PKGEXT) + buildinstall ${savedir}/$pkgfilename $2 $pkgname fi } @@ -566,16 +619,25 @@ installhandling() { # First install the explicit pacman packages, let pacman prompt if [[ $pacmanpackages ]]; then - runasroot $PACMAN "${PACOPTS[@]}" -S -- "${pacmanpackages[@]}" + echo -e "${COLOR6}Pacman Targets ($((${#pacmanpackages[@]}))):${ENDCOLOR} ${pacmanpackages[@]}" + echo + if [[ $buildonly = 1 ]]; then + downfile=$($PACMAN -Sp -- "${pacmanpackages[@]}" | awk -v dir=$downdir -F "/" '{print dir"/"$NF}') + bundle+=("${downfile}") + runasroot $PACMAN "${PACOPTS[@]}" -Sw --cachedir $downdir -- "${pacmanpackages[@]}" + else + runasroot $PACMAN "${PACOPTS[@]}" -S -- "${pacmanpackages[@]}" + fi fi if [[ -z $aurtargets ]]; then + listbundle exit fi # Test if aurpackages are already installed; echo warning if so for pkg in "${aurtargets[@]}"; do if existsinlocal "$pkg"; then - localversion="$($PACMAN -Qs "$pkg" | grep -F "local/$pkg " | cut -d ' ' -f 2)" + localversion="$($pacmanbin -Qs "$pkg" | grep -F "local/$pkg " | cut -d ' ' -f 2)" if ! aurversionisnewer "$pkg" "$localversion"; then if [ "$needed" = "1" ]; then echo -e "${COLOR6}notice:$ENDCOLOR $pkg-$localversion is up to date -- skipping" @@ -615,7 +677,8 @@ installhandling() { fi # Prompt to proceed - echo -en "\nProceed with installation? [Y/n] " + [[ $buildonly = 1 ]] && phrasing="building" || phrasing="installation" + echo -en "\nProceed with ${phrasing}? [Y/n] " if ! [[ $noconfirm ]]; then proceed || exit else @@ -624,6 +687,10 @@ installhandling() { # Install pacman dependencies if [[ $pacmandepends ]]; then + if [[ $buildonly = 1 ]]; then + downfile=$($PACMAN -Sp -- "${pacmandepends[@]}" | awk -v dir=$downdir -F "/" '{print dir"/"$NF}') + bundle+=("${downfile}") + fi runasroot $PACMAN --noconfirm --asdeps -S -- "${pacmandepends[@]}" || err "Installation failed." fi @@ -637,7 +704,7 @@ installhandling() { # Install the aur packages for package in "${aurtargets[@]}"; do scrapeaurdeps "$package" - if $PACMAN -T "${dependencies[@]}" &>/dev/null; then + if $pacmanbin -T "${dependencies[@]}" &>/dev/null; then checkcache "$package" "explicit" else echo "Dependencies for \`$package' are not met, not building..." @@ -645,14 +712,19 @@ installhandling() { done # Remove build dependencies + if [[ $buildonly = 1 ]]; then + purgedeps+=("${pacmandepends[@]}") + fi if [[ $purgedeps ]]; then - runasroot $PACMAN --noconfirm -R -- "${purgedeps[@]}" + purgedepends=( $(echo -e "${purgedeps[*]}" | sort -u) ) + runasroot $pacmanbin --noconfirm -Ru -- "${purgedepends[@]}" 2>/dev/null fi + listbundle } run_quick_check() { - bigurl="https://aur.archlinux.org/rpc.php?type=multiinfo" - for p in $($PACMAN -Qqm); do + bigurl="$RPCURL=multiinfo" + for p in $($pacmanbin -Qqm); do bigurl="$bigurl&arg\[\]=$p" done parsed_aur="$(curl -s "$bigurl" | \ @@ -672,8 +744,8 @@ run_quick_check() { DBPath="${DBPath:-/var/lib/pacman/}" mkdir -p "$CHECKUPDATE_DB" ln -s "${DBPath}/local" "$CHECKUPDATE_DB" &> /dev/null - fakeroot $PACMAN -Sqy --dbpath "$CHECKUPDATE_DB" &> /dev/null - $PACMAN -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null + fakeroot $pacmanbin -Sqy --dbpath "$CHECKUPDATE_DB" &> /dev/null + $pacmanbin -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null } # proceed with installation prompt @@ -696,9 +768,9 @@ nap() { # Wrap pacman parameters pacwrap() { if [[ $1 = -Q* ]]; then - $PACMAN "$@"; + $pacmanbin "$@"; else - runasroot $PACMAN "$@"; + runasroot $pacmanbin "$@"; fi; exit 0; } @@ -716,6 +788,7 @@ while [[ $1 ]]; do '-G') option=download ;; -L*) option=list ; pacmanarg="${1//-L}" ;; '--auronly') auronly='1' ; unset noaur ;; + '--buildonly') buildonly='1' ;; '--cachevcs') cachevcs='1' ;; '--config') config='1' ; apacmanconf="$2" ; shift ;; '--devel') devel='1' ;; @@ -725,6 +798,7 @@ while [[ $1 ]]; do '--noaur') noaur='1' ; unset auronly ;; '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; '--noedit') noedit='1' ;; + '--nofail') nofail='1' ;; '--preview') preview='1' ;; '--purgebuild') purgebuild='1' ;; '--quickcheck') quickcheck='1' ;; @@ -737,7 +811,13 @@ while [[ $1 ]]; do '-v'|'--verbose') verbose='1' ;; '-V'|'--version') version ;; '--') shift ; packageargs+=("$@") ; break ;; - -*) pacwrap "$@" ;; + -D*) pacwrap "$@" ;; + -Q*) pacwrap "$@" ;; + -R*) pacwrap "$@" ;; + -S*) pacwrap "$@" ;; + -T*) pacwrap "$@" ;; + -U*) pacwrap "$@" ;; + -*) invalid "$@" ;; *) packageargs+=("$1") ;; esac shift @@ -787,7 +867,7 @@ if [[ $option = update ]]; then total=0 if ! [[ $noaur ]]; then echo -e "${COLOR5}:: ${COLOR1}Synchronizing aur database...${ENDCOLOR}" - IFS=$'\n' read -rd '' -a packages < <($PACMAN -Qm) + IFS=$'\n' read -rd '' -a packages < <($pacmanbin -Qm) newpackages=() checkignores=() total="${#packages[@]}" @@ -900,9 +980,9 @@ if [[ $option = search || $option = searchinstall ]]; then # Pacman searching if ! [[ $auronly ]]; then if [[ $quiet ]]; then - results="$($PACMAN -Ssq -- "${packageargs[@]}")" + results="$($pacmanbin -Ssq -- "${packageargs[@]}")" else - results="$($PACMAN -Ss -- "${packageargs[@]}")" + results="$($pacmanbin -Ss -- "${packageargs[@]}")" results="$(sed -r "s|^[^ ][^/]*/|$S${COLOR3}&$S${COLOR1}|" <<< "$results")" results="$(sed -r "s|^([^ ]+) ([^ ]+)(.*)$|\1 $S${COLOR2}\2$S${ENDCOLOR}\3|" <<< "$results")" fi @@ -911,7 +991,7 @@ if [[ $option = search || $option = searchinstall ]]; then else # interactive echo -e "$results" | fmt -"$_WIDTH" -s | nl -v 0 -w 1 -s ' ' -b 'p^[^ ]' fi | sed '/^$/d' - pacname=( $($PACMAN -Ssq -- "${packageargs[@]}") ) + pacname=( $($pacmanbin -Ssq -- "${packageargs[@]}") ) pactotal="${#pacname[@]}" else pactotal=0 @@ -1000,7 +1080,7 @@ if [[ $option = info ]]; then sourcemakepkgconf for package in "${packageargs[@]}"; do if ! [[ $auronly ]] && existsinpacman "$package"; then - results="$($PACMAN -Si -- "$package")" + results="$($pacmanbin -Si -- "$package")" results="$(sed -r "s|^(Repository[^:]*:)(.*)$|\1$S${COLOR3}\2$S${ENDCOLOR}|" <<< "$results")" results="$(sed -r "s|^(Name[^:]*:)(.*)$|\1$S${COLOR1}\2$S${ENDCOLOR}|" <<< "$results")" results="$(sed -r "s|^(Version[^:]*:)(.*)$|\1$S${COLOR2}\2$S${ENDCOLOR}|" <<< "$results")" diff --git a/apacman.8 b/apacman.8 index d52ff5f..5ce30a8 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 01/14/2015 +.\" Date: 02/07/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "01/14/2015" "apacman" "apacman Manual" +.TH "APACMAN" "8" "02/07/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -75,6 +75,13 @@ Show apacman usage\&. Only perform commands for the AUR\&. .RE .PP +\fB\-\-buildonly\fR +.RS 4 +Build packages but do not install them then post\-install remove unneeded build makedepends\&. +.PP +\fBNote:\fR list of package filenames stored in \fI$tmpdir/bundle\&.lst\fB +.RE +.PP \fB\-\-config\fR <\'file\'> .RS 4 Use alternate configuration file\&. @@ -120,6 +127,11 @@ Perform commands without confirmation from the user\&. Perform commands without asking if the user wants to edit any installation files\&. .RE .PP +\fB\-\-nofail\fR +.RS 4 +Immediately quit if any package does not build successfully\&. +.RE +.PP \fB\-\-preview\fR .RS 4 Always offer to edit the pkgbuild before sourcing it\&. diff --git a/apacman.conf b/apacman.conf index 5941a23..a3c4f30 100644 --- a/apacman.conf +++ b/apacman.conf @@ -8,12 +8,14 @@ # #auronly=1 +#buildonly=1 #cachevcs=1 #ignorearch=1 #needed=1 +#noaur=1 #noconfirm=1 #noedit=1 -#noaur=1 +#nofail=1 #preview=1 #purgebuild=1 #quiet=1 @@ -30,7 +32,9 @@ #makepkgconf="/etc/makepkg.conf" #usermakepkgconf="$HOME/.makepkg.conf" #pacmanconf="/etc/pacman.conf" +#downdir="/var/cache/pacman/pkg" #savedir="/var/cache/apacman/pkg" +#editor="nano -w" #RPCURL="https://aur.archlinux.org/rpc.php?type" #PKGURL="https://aur.archlinux.org" #ABSURL="rsync.archlinux.org" diff --git a/apacman.conf.5 b/apacman.conf.5 index 0852a61..f255fea 100644 --- a/apacman.conf.5 +++ b/apacman.conf.5 @@ -2,12 +2,12 @@ .\" Title: apacman.conf .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 01/14/2015 +.\" Date: 02/07/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN\&.CONF" "5" "01/14/2015" "apacman" "apacman Manual" +.TH "APACMAN\&.CONF" "5" "02/07/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -68,6 +68,11 @@ Each option must be lowercase (except for URLs and colors which must be UPPERCAS Only do actions for AUR\&. .RE .PP +\fBbuildonly =\fR 1 +.RS 4 +Builds packages without installing and removes new build depends after\&. +.RE +.PP \fBcachevcs =\fR 1 .RS 4 Installs cached VCS packages if newer than AUR PKGBUILD versions\&. @@ -83,6 +88,11 @@ Ignore missing architecture in PKGBUILD (mostly for ARM systems)\&. Do not install up-to-date packages\&. .RE .PP +\fBnoaur =\fR 1 +.RS 4 +Do no actions for AUR (hint: useful with --warn)\&. +.RE +.PP \fBnoconfirm =\fR 1 .RS 4 Do not prompt for any confirmation\&. @@ -93,9 +103,9 @@ Do not prompt for any confirmation\&. Do not prompt to edit files with EDITOR\&. .RE .PP -\fBnoaur =\fR 1 +\fBnofail =\fR 1 .RS 4 -Do no actions for AUR (hint: useful with --warn)\&. +Do not continue if a package fails to build\&. .RE .PP \fBpreview =\fR 1 @@ -172,6 +182,13 @@ Overrides the default location of the package cache directory\&. \fBDefault\fR: /var/cache/apacman/pkg .RE .PP +\fBeditor =\fR nano \-w +.RS 4 +Overrides the default text editor for PKGBUILDs\&. +.sp .5v +\fBDefault\fR: \fI$EDITOR\fR or vi +.RE +.PP \fBRPCURL =\fR url/to/AUR/Search .RS 4 Overrides the URL address to the Arch User Repository's RPC-interface API\&. @@ -185,6 +202,13 @@ Overrides the URL address prefix to the Arch User Repository's PKBUILDs\&. .sp .5v \fBDefault\fR: https://aur.archlinux.org .RE +.PP +\fBABSURL =\fR url/to/ABS/PKGBUILDs +.RS 4 +Overrides the URL address prefix to the Arch Build System's PKBUILDs\&. +.sp .5v +\fBDefault\fR: rsync.archlinux.org +.RE .SH "COLORS" .sp From d596ad517539960877d06598a0fbce616bccecc9 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sun, 8 Feb 2015 16:58:14 -0800 Subject: [PATCH 19/32] Version 1.4 - Bug fixes for cached AUR pkgs and --cachevcs --- README.md | 1 + apacman | 47 ++++++++++++++++++++++------------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index c35b672..5d422d7 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* (**new**) Bug fix for saved AUR packages and --cachevcs * (**new**) Bug fix for pacmatic * (**new**) Build status log * (**new**) Override EDITOR for PKGBUILDs in config file diff --git a/apacman b/apacman index 42d63ab..143e859 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.3" +version="1.4" # Copyright OS Hazard # # New Features: @@ -424,31 +424,29 @@ buildstatus() { [[ $nofail = 1 && $1 != 0 ]] && exit 1 } -# Build install ($1 is package filename, $2 is dependency or explicit, $3 is package) +# Build install ($1 is package, $2 is dependency or explicit, $3 is filename) buildinstall() { if [[ $2 = dependency ]]; then - runasroot $PACMAN ${PACOPTS[@]} --asdeps -U "$1" - [[ $buildonly = 1 ]] && bundle+=("$1") - [[ $buildonly = 1 ]] && purgedeps+=("$3") + runasroot $PACMAN ${PACOPTS[@]} --asdeps -U "$3" + [[ $buildonly = 1 ]] && bundle+=("$3") + [[ $buildonly = 1 ]] && purgedeps+=("$1") elif [[ $2 = explicit ]]; then - [[ $buildonly = 1 ]] && echo -e "${COLOR6}notice:${ENDCOLOR} $3 built -- not installing" - [[ $buildonly = 1 ]] && bundle+=("$1") - [[ $buildonly != 1 ]] && runasroot $PACMAN ${PACOPTS[@]} -U "$1" + [[ $buildonly = 1 ]] && echo -e "${COLOR6}notice:${ENDCOLOR} $1 built -- not installing" + [[ $buildonly = 1 ]] && bundle+=("$3") + [[ $buildonly != 1 ]] && runasroot $PACMAN ${PACOPTS[@]} -U "$3" fi } # Checks if aur cache is newer than aur ($1 is package, $2 is aur version) checkvcs() { - if [ "$cachevcs" = "1" ]; then - cachefile=$(ls --sort=time ${savedir}/${1}-*-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1 | awk -F "${savedir}/${1}-" '{print $2}'); + cachefile=$(ls -t ${savedir}/${1}-*-{any,${makearch}}.pkg.{tar,tar.xz} 2>/dev/null | awk NR==1 | awk -F "${savedir}/${1}-" '{print $2}'); cachever=$(echo "$cachefile" | sed "s/-any.pkg.tar.xz//g;s/-any.pkg.tar//g;s/-${makearch}.pkg.tar.xz//g;s/-${makearch}.pkg.tar//g"); - if [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -gt 0 ]]; then - echo -e "${COLOR7}warning:${ENDCOLOR} $pkg -- ${COLOR7}verify cache newer than AUR${ENDCOLOR} ($pkgver-$pkgrel)" - pkgfile="${savedir}/${1}-${cachefile}"; - elif [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -eq 0 ]]; then - pkgfile="${savedir}/${1}-${cachefile}"; - fi - fi; + if [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -gt 0 ]]; then + echo -e "${COLOR7}warning:${ENDCOLOR} $1 -- ${COLOR7}verify cache newer than AUR${ENDCOLOR} ($pkgver-$pkgrel)" + pkgfile="${savedir}/${1}-${cachefile}"; + elif [[ "$(LC_ALL=C vercmp "$cachever" "$2")" -eq 0 ]]; then + pkgfile="${savedir}/${1}-${cachefile}"; + fi } # Checks if packages are in aur cache ($1 is package, $2 is dependency or explicit) @@ -465,23 +463,22 @@ checkcache() { fi if [ -f "$pkgfile" ]; then - cacheinstall "$pkgfile" "$2" + cacheinstall "$1" "$2" "$pkgfile" else aurinstall "$1" "$2" fi; } -# Installs packages from cache ($1 is package filename, $2 is dependency or explicit) +# Installs packages from cache ($1 is package, $2 is dependency or explicit, $3 is filename) cacheinstall() { if [ "$cachevcs" = "1" ]; then - pkgrelease="$pkg-$cachever" + pkgrelease="$1-$cachever" else - pkgrelease="$pkg-$pkgver-$pkgrel" + pkgrelease="$1-$pkgver-$pkgrel" fi - echo -e "${COLOR6}notice:$ENDCOLOR installing $pkgrelease from cache" - pkgfilename=$(ls ${savedir}/$pkgrelease-*$PKGEXT) - buildinstall $pkgfilename $2 $pkg + echo -e "${COLOR6}notice:$ENDCOLOR installing $pkgrelease from cache" + buildinstall $1 $2 $3 } # Installs packages from aur ($1 is package, $2 is dependency or explicit) @@ -560,7 +557,7 @@ aurinstall() { runasroot cp $pkgname-*$PKGEXT $savedir/ echo -e "${COLOR5} -> ${COLOR1}Saved package:${ENDCOLOR} $(ls $pkgname-*$PKGEXT)"; pkgfilename=$(ls $pkgname-*$PKGEXT) - buildinstall ${savedir}/$pkgfilename $2 $pkgname + buildinstall $pkgname $2 ${savedir}/$pkgfilename fi } From 25132f142cd4d3977245a08472b090a0fd08329b Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Fri, 13 Feb 2015 22:51:01 -0800 Subject: [PATCH 20/32] Minor fix for status --- apacman | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apacman b/apacman index 143e859..b18c9a4 100755 --- a/apacman +++ b/apacman @@ -417,8 +417,8 @@ buildstatus() { fi echo -ne "${COLOR5} ->${ENDCOLOR} ${COLOR1}Status${ENDCOLOR}" - [[ $success ]] && echo -ne "\t${COLOR4}built (${#success[@]}):${ENDCOLOR} $success" - [[ $failure ]] && echo -ne "\t${COLOR7}failed (${#failure[@]}):${ENDCOLOR} $failure" + [[ $success ]] && echo -ne "\t${COLOR4}built (${#success[@]}):${ENDCOLOR} ${success[@]}" + [[ $failure ]] && echo -ne "\t${COLOR7}failed (${#failure[@]}):${ENDCOLOR} ${failure[@]}" echo "" [[ $nofail = 1 && $1 != 0 ]] && exit 1 From 344849bea6e14a94e7615e998e275532ae45c4fb Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sat, 14 Feb 2015 00:15:22 -0800 Subject: [PATCH 21/32] Version 1.5 - Add experimental --nosource option (WIP) --- apacman | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/apacman b/apacman index b18c9a4..cdbde45 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.4" +version="1.5" # Copyright OS Hazard # # New Features: @@ -10,6 +10,7 @@ version="1.4" # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --nosource for security do not source PKGBUILDs (WIP) # * --buildonly create but do not install packages # * --nofail do not continue if a package fails to build # * --purgebuild remove unneeded build dependencies @@ -126,6 +127,7 @@ usage() { echo ' --noconfirm - do not prompt for any confirmation' echo ' --noedit - do not prompt to edit files' echo ' --nofail - do not continue if a package fails to build' + echo ' --nosource - do not source PKGBUILDs (WIP)' echo ' --preview - edit pkgbuild before sourcing' echo ' --purgebuild - remove unneeded build dependencies' echo ' --quickcheck - check for updates and exit' @@ -174,6 +176,40 @@ runasroot() { fi } +# FIXME +parser() { + if [ -f "$1" ]; then + if [[ $nosource == 1 ]]; then + unset pkgname pkgver pkgrel arch checkdepends makedepends depends + pkgname=$(grep -o "^pkgname=\S*" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_.\n'); + pkgver=$(grep -o "^pkgver=\S*" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_.\n'); + pkgrel=$(grep -o "^pkgrel=\S*" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_.\n'); + _arch=$(grep "^arch=" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_. \n'); + _checkdepends=$(grep "^checkdepends=" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_. \n'); + _makedepends=$(grep "^makedepends=" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_. \n'); + _depends=$(grep "^depends=" "$1" | awk -F = '{print $2}' | tr -dc 'a-z0-9-_. \n'); + + for _machine in $_arch; do arch+=("$_machine"); done + for _pkg in $_checkdepends; do depends+=("$_pkg"); done + for _pkg in $_makedepends; do makedepends+=("$_pkg"); done + for _pkg in $_depends; do depends+=("$_pkg"); done + + echo "==> pkgname: $pkgname" + echo "==> pkgver: $pkgver" + echo "==> pkgrel: $pkgrel" + echo "==> arch: ${arch[@]}" + echo "==> checkdepends: ${checkdepends[@]}" + echo "==> makedepends: ${makedepends[@]}" + echo "==> depends: ${depends[@]}" + return 0 + else + . "$1" + fi + else + return 1 + fi +} + # Source apacman.conf file sourceapacmanconf() { [[ -r "$apacmanconf" ]] && . "$apacmanconf" @@ -239,7 +275,7 @@ existsinlocal() { # Scrapes the aur deps from PKGBUILDS and puts in globally available dependencies array scrapeaurdeps() { pkginfo "$1" "$preview" - . "$tmpdir/$1.PKGBUILD" + parser "$tmpdir/$1.PKGBUILD" [[ $skiptest = 1 ]] && unset checkdepends IFS=$'\n' dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}\n${checkdepends[*]}" | sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) ) @@ -488,7 +524,7 @@ aurinstall() { # Prepare the installation directory # If there is an old directory and aurversion is not newer, use old directory - if . "$dir/$1/PKGBUILD" &>/dev/null && ! aurversionisnewer "$1" "$pkgver-$pkgrel"; then + if parser "$dir/$1/PKGBUILD" &>/dev/null && ! aurversionisnewer "$1" "$pkgver-$pkgrel"; then cd "$dir/$1" else [[ -d "$dir" ]] && rm -rf "$dir" @@ -523,7 +559,7 @@ aurinstall() { # Allow user to edit .install unset install - . PKGBUILD + parser PKGBUILD confirm_edit "${COLOR6}Edit $install with \$editor? [Y/n]${ENDCOLOR} " "$install" # Installation (makepkg and pacman) @@ -796,6 +832,7 @@ while [[ $1 ]]; do '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; '--noedit') noedit='1' ;; '--nofail') nofail='1' ;; + '--nosource') nosource='1' ;; '--preview') preview='1' ;; '--purgebuild') purgebuild='1' ;; '--quickcheck') quickcheck='1' ;; @@ -893,7 +930,7 @@ if [[ $option = update ]]; then continue fi unset _darcstrunk _cvsroot _gitroot _svntrunk _bzrtrunk _hgroot - . "$tmpdir/$pkg.PKGBUILD" + parser "$tmpdir/$pkg.PKGBUILD" if [[ "$(LC_ALL=C vercmp "$pkgver-$pkgrel" "$ver")" -gt 0 ]]; then newpackages+=("$pkg") elif [[ ${_darcstrunk} || ${_cvsroot} || ${_gitroot} || ${_svntrunk} || ${_bzrtrunk} || ${_hgroot} ]]; then @@ -1088,7 +1125,7 @@ if [[ $option = info ]]; then elif ! [[ $noaur ]]; then # Check to see if it is in the aur pkginfo "$package" "$preview" [[ -s "$tmpdir/$package.PKGBUILD" ]] || err "${COLOR7}error:${ENDCOLOR} package '$package' was not found" - . "$tmpdir/$package.PKGBUILD" + parser "$tmpdir/$package.PKGBUILD" # Echo out the -Si formatted package information # Retrieve each element in order and echo them immediately From c72bd99d475f49b4146eb53c3e0a67e6b8791b1c Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Tue, 19 May 2015 04:23:38 -0700 Subject: [PATCH 22/32] Version 1.6 - Add installed to search, AUR link to info and emerge-style --progress status for terminal titlebar --- README.md | 17 ++++++++++------- apacman | 46 +++++++++++++++++++++++++++++++++++++++++----- apacman.8 | 9 +++++++-- apacman.conf | 1 + apacman.conf.5 | 9 +++++++-- 5 files changed, 66 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5d422d7..89cdbb9 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,16 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: -* (**new**) Bug fix for saved AUR packages and --cachevcs -* (**new**) Bug fix for pacmatic -* (**new**) Build status log -* (**new**) Override EDITOR for PKGBUILDs in config file -* (**new**) --buildonly parameter to build but not AUR install packages -* (**new**) --nofail parameter to quit if a package does not build -* (**new**) --purgebuild parameter to remove unneeded build depends +* (**new**) Display [installed], [installed: VER], or [local: VER] in -Ss +* (**new**) --progress parameter sets terminal title to package status +* (**new**) Add AUR link to -Si info +* Bug fix for saved AUR packages and --cachevcs +* Bug fix for pacmatic +* Build status log +* Override EDITOR for PKGBUILDs in config file +* --buildonly parameter to build but not AUR install packages +* --nofail parameter to quit if a package does not build +* --purgebuild parameter to remove unneeded build depends * --skiptest to avoid installing unit test packages * Config file support (/etc/apacman.conf) * Cleaned up manpages diff --git a/apacman b/apacman index cdbde45..2be524e 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.5" +version="1.6" # Copyright OS Hazard # # New Features: @@ -10,6 +10,7 @@ version="1.5" # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --progress transaction status in terminal titlebar # * --nosource for security do not source PKGBUILDs (WIP) # * --buildonly create but do not install packages # * --nofail do not continue if a package fails to build @@ -91,6 +92,11 @@ invalid() { echo -e "${COLOR7}error:${ENDCOLOR} invalid option \`$1'" } +progress() { + [[ $progress == 1 || $progress == 3 ]] && echo -en "\033]2;$@\007" + [[ $progress == 2 || $progress == 3 ]] && notify-send "$@" +} + deptest() { type -p $1 &>/dev/null } @@ -129,6 +135,7 @@ usage() { echo ' --nofail - do not continue if a package fails to build' echo ' --nosource - do not source PKGBUILDs (WIP)' echo ' --preview - edit pkgbuild before sourcing' + echo ' --progress - transaction status in terminal titlebar' echo ' --purgebuild - remove unneeded build dependencies' echo ' --quickcheck - check for updates and exit' echo ' --quiet - only output package name for searches' @@ -158,7 +165,7 @@ infoconf() { done vars="auronly buildonly cachevcs ignorearch needed noaur noconfirm noedit" - vars="$vars nofail preview purgebuild quiet skipcache skipinteg skiptest warn" + vars="$vars nofail preview progress purgebuild quiet skipcache skipinteg skiptest warn" for j in $vars; do varstatus $j done @@ -498,9 +505,12 @@ checkcache() { checkvcs $1 $pkgver-$pkgrel fi + pkgnum=$((pkgnum+1)) if [ -f "$pkgfile" ]; then + progress "Installing ${pkgnum}/${totalcount} $1" cacheinstall "$1" "$2" "$pkgfile" else + progress "Building ${pkgnum}/${totalcount} $1" aurinstall "$1" "$2" fi; } @@ -704,6 +714,7 @@ installhandling() { fi # Sanity check + pkgnum="${#pacmandepends[@]}" totalcount="$((${#aurdepends[@]}+${#aurtargets[@]}+${#pacmandepends[@]}))" if [ "$totalcount" = "0" ]; then echo -e "${COLOR5}==>$ENDCOLOR nothing to do"; exit 0; @@ -724,6 +735,7 @@ installhandling() { downfile=$($PACMAN -Sp -- "${pacmandepends[@]}" | awk -v dir=$downdir -F "/" '{print dir"/"$NF}') bundle+=("${downfile}") fi + progress "Installing ${pkgnum}/${totalcount} packages" runasroot $PACMAN --noconfirm --asdeps -S -- "${pacmandepends[@]}" || err "Installation failed." fi @@ -750,8 +762,10 @@ installhandling() { fi if [[ $purgedeps ]]; then purgedepends=( $(echo -e "${purgedeps[*]}" | sort -u) ) + progress "Removing ${#purgedepends[@]} build depends" runasroot $pacmanbin --noconfirm -Ru -- "${purgedepends[@]}" 2>/dev/null fi + listbundle } @@ -834,6 +848,7 @@ while [[ $1 ]]; do '--nofail') nofail='1' ;; '--nosource') nosource='1' ;; '--preview') preview='1' ;; + '--progress') progress='1' ;; '--purgebuild') purgebuild='1' ;; '--quickcheck') quickcheck='1' ;; '--quiet') quiet='1' ;; @@ -1019,6 +1034,7 @@ if [[ $option = search || $option = searchinstall ]]; then results="$($pacmanbin -Ss -- "${packageargs[@]}")" results="$(sed -r "s|^[^ ][^/]*/|$S${COLOR3}&$S${COLOR1}|" <<< "$results")" results="$(sed -r "s|^([^ ]+) ([^ ]+)(.*)$|\1 $S${COLOR2}\2$S${ENDCOLOR}\3|" <<< "$results")" + results="$(sed -e "s| \[|\\${COLOR4}&|" -e "s|\]|&\\${ENDCOLOR}|" <<< "$results")" fi if [[ $option = search ]]; then echo -e "$results" | fmt -"$_WIDTH" -s @@ -1046,6 +1062,22 @@ if [[ $option = search || $option = searchinstall ]]; then done sed -i '/^$/d' "$tmpdir/search.results" + # Check versioning + localpkgs=$(pacman -Q) + for pkg in $(awk '{print $1}' "$tmpdir/search.results"); do + localver=$(echo "$localpkgs" | grep "^${pkg} " | awk '{print $2}'); + if [ ! -z "$localver" ]; then + searchver=$(grep -E "^${pkg}[[:space:]]" "$tmpdir/search.results" | awk '{print $2}') + if [ "$searchver" = "$localver" ]; then + sed -i "s|$pkg[[:space:]]$searchver|& [installed]|" "$tmpdir/search.results" + elif [[ "$(LC_ALL=C vercmp "$searchver" "$localver")" -gt 0 ]]; then + sed -i "s|$pkg[[:space:]]$searchver|& [installed: $localver]|" "$tmpdir/search.results" + else + sed -i "s|$pkg[[:space:]]$searchver|& [local: $localver]|" "$tmpdir/search.results" + fi + fi + done + # Prepare tmp file and arrays IFS=$'\n' read -rd '' -a aurname < <(cut -f 1 "$tmpdir/search.results") aurtotal="${#aurname[@]}" @@ -1055,20 +1087,23 @@ if [[ $option = search || $option = searchinstall ]]; then fi # Echo out the -Ss formatted package information - IFS=$'\t\n' if [[ $option = search ]]; then if [[ $quiet ]]; then printf "%s\n" ${aurname[@]} elif [[ -s "$tmpdir/search.results" ]]; then - printf "${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(cat "$tmpdir/search.results") + resultsaur="$(printf "${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(cat "$tmpdir/search.results"))" + resultsaur="$(sed -e "s| \[|\\${COLOR4}&|" -e "s|\] |&\\${ENDCOLOR}|" <<< "$resultsaur")" + echo -e "$resultsaur" fi else # interactive if [[ $quiet ]]; then nl -v ${pactotal:-0} -w 1 -s ' ' <(cut -f 1 "$tmpdir/search.results") elif [[ -s "$tmpdir/search.results" ]]; then - printf "%d ${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results") + resultsaur="$(printf "%d ${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results"))" + resultsaur="$(sed -e "s| \[|\\${COLOR4}&|" -e "s|\] |&\\${ENDCOLOR}|" <<< "$resultsaur")" + echo -e "$resultsaur" fi fi | fmt -"$_WIDTH" -s unset IFS @@ -1133,6 +1168,7 @@ if [[ $option = info ]]; then echo -e "${COLOR1}Name : $pkgname" echo -e "${COLOR1}Version : ${COLOR2}$pkgver-$pkgrel" echo -e "${COLOR1}URL : ${COLOR4}$url" + echo -e "${COLOR1}AUR : ${COLOR4}$PKGURL/packages/$pkgname/" echo -e "${COLOR1}Licenses : ${ENDCOLOR}${license[@]}" echo -e "${COLOR1}Groups : ${ENDCOLOR}${groups[@]:-None}" echo -e "${COLOR1}Provides : ${ENDCOLOR}${provides[@]:-None}" diff --git a/apacman.8 b/apacman.8 index 5ce30a8..0cebb56 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 02/07/2015 +.\" Date: 05/19/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "02/07/2015" "apacman" "apacman Manual" +.TH "APACMAN" "8" "05/19/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -137,6 +137,11 @@ Immediately quit if any package does not build successfully\&. Always offer to edit the pkgbuild before sourcing it\&. .RE .PP +\fB\-\-progress\fR +.RS 4 +Terminal title transaction status\&. +.RE +.PP \fB\-\-purgebuild\fR .RS 4 Post\-install remove unneeded build makedepends\&. diff --git a/apacman.conf b/apacman.conf index a3c4f30..1f7f272 100644 --- a/apacman.conf +++ b/apacman.conf @@ -17,6 +17,7 @@ #noedit=1 #nofail=1 #preview=1 +#progress=1 #purgebuild=1 #quiet=1 #skipcache=1 diff --git a/apacman.conf.5 b/apacman.conf.5 index f255fea..ac75b36 100644 --- a/apacman.conf.5 +++ b/apacman.conf.5 @@ -2,12 +2,12 @@ .\" Title: apacman.conf .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 02/07/2015 +.\" Date: 05/19/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN\&.CONF" "5" "02/07/2015" "apacman" "apacman Manual" +.TH "APACMAN\&.CONF" "5" "05/19/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -113,6 +113,11 @@ Do not continue if a package fails to build\&. Prompt to edit PKGBUILD and .install before building\&. .RE .PP +\fBprogress =\fR 1 +.RS 4 +Status updates to terminal title (1) or libnotify (2) or both (3)\&. +.RE +.PP \fBpurgebuild =\fR 1 .RS 4 Remove unneeded build dependencies\&. From a657d90bab9359149ac42f014d9f84e2762cfecc Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 20 May 2015 01:44:29 -0700 Subject: [PATCH 23/32] Version 1.7 - Add support for PGP signed packages (WIP) --- README.md | 1 + apacman | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89cdbb9..ca325f8 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer Features: +* (**new**) Signed package support (WIP) * (**new**) Display [installed], [installed: VER], or [local: VER] in -Ss * (**new**) --progress parameter sets terminal title to package status * (**new**) Add AUR link to -Si info diff --git a/apacman b/apacman index 2be524e..09244f6 100755 --- a/apacman +++ b/apacman @@ -1,11 +1,12 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.6" +version="1.7" # Copyright OS Hazard # # New Features: # * Config file support +# * Signed package support (WIP) # * Built-in ABS support (WIP) # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg @@ -572,6 +573,26 @@ aurinstall() { parser PKGBUILD confirm_edit "${COLOR6}Edit $install with \$editor? [Y/n]${ENDCOLOR} " "$install" + # Retrieve PGP keys + if [[ ${validpgpkeys[@]} ]]; then + keyexists=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) + fi + if ! [[ $keyexists ]]; then + echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" + for pgpkey in ${validpgpkeys[@]}; do + echo -e "\t${COLOR7}${validpgpkeys[@]}${ENDCOLOR}" + done + echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " + if ! [[ $noconfirm ]]; then + proceed || exit + else + echo + fi + gpg --recv-key ${validpgpkeys[@]} + keycheck=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) + echo + fi + # Installation (makepkg and pacman) rm -f *$PKGEXT if [[ $UID -eq 0 ]]; then @@ -582,6 +603,11 @@ aurinstall() { makepkg $MAKEPKGOPTS -f fi + # Remove added PGP keys + if [[ $keycheck ]]; then + gpg --batch --yes --delete-keys ${validpgpkeys[@]} + fi + # Build check if [[ $? -ne 0 ]]; then failure+=("$1") @@ -722,7 +748,7 @@ installhandling() { # Prompt to proceed [[ $buildonly = 1 ]] && phrasing="building" || phrasing="installation" - echo -en "\nProceed with ${phrasing}? [Y/n] " + echo -en "\n${COLOR5}:: ${COLOR1}Proceed with ${phrasing}? [Y/n]${ENDCOLOR} " if ! [[ $noconfirm ]]; then proceed || exit else From 64f248a57f2403caf386c0be1d11e5c0c70d5ab6 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 20 May 2015 01:50:49 -0700 Subject: [PATCH 24/32] Fix for PGP check --- apacman | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/apacman b/apacman index 09244f6..c777646 100755 --- a/apacman +++ b/apacman @@ -576,21 +576,21 @@ aurinstall() { # Retrieve PGP keys if [[ ${validpgpkeys[@]} ]]; then keyexists=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) - fi - if ! [[ $keyexists ]]; then - echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" - for pgpkey in ${validpgpkeys[@]}; do - echo -e "\t${COLOR7}${validpgpkeys[@]}${ENDCOLOR}" - done - echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " - if ! [[ $noconfirm ]]; then - proceed || exit - else + if ! [[ $keyexists ]]; then + echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" + for pgpkey in ${validpgpkeys[@]}; do + echo -e "\t${COLOR7}${validpgpkeys[@]}${ENDCOLOR}" + done + echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " + if ! [[ $noconfirm ]]; then + proceed || exit + else + echo + fi + gpg --recv-key ${validpgpkeys[@]} + keycheck=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) echo fi - gpg --recv-key ${validpgpkeys[@]} - keycheck=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) - echo fi # Installation (makepkg and pacman) From 7537663a6a355ec54793e9b09dffa94184e41ee9 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 20 May 2015 01:56:52 -0700 Subject: [PATCH 25/32] Another fix for non-PGP packages --- apacman | 1 + 1 file changed, 1 insertion(+) diff --git a/apacman b/apacman index c777646..2408119 100755 --- a/apacman +++ b/apacman @@ -530,6 +530,7 @@ cacheinstall() { # Installs packages from aur ($1 is package, $2 is dependency or explicit) aurinstall() { + unset validpgpkeys dir="${TMPDIR:-/tmp}/pkgbuild-$UID/$1" sourcemakepkgconf From 5efa269233cba79df0214b6c73475c1df9930dd5 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 20 May 2015 08:11:26 -0700 Subject: [PATCH 26/32] Version 1.8 - Bug fixes for aurbuild PGP sigs, color and noconfirm --- apacman | 73 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/apacman b/apacman index 2408119..fc8a1db 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.7" +version="1.8" # Copyright OS Hazard # # New Features: @@ -50,6 +50,7 @@ makepkgconf='/etc/makepkg.conf' usermakepkgconf="$HOME/.makepkg.conf" pacmanconf='/etc/pacman.conf' apacmanconf='/etc/apacman.conf' +gpgconf='/etc/pacman.d/gnupg/gpg.conf' downdir='/var/cache/pacman/pkg' savedir='/var/cache/apacman/pkg' @@ -226,6 +227,7 @@ sourceapacmanconf() { [[ $skiptest ]] && MAKEPKGOPTS+=("--nocheck") [[ $skipinteg ]] && MAKEPKGOPTS+=("--skipinteg") [[ $ignorearch ]] && MAKEPKGOPTS+=("--ignorearch") + export noconfirm COLOR1 COLOR2 COLOR3 COLOR4 COLOR5 COLOR6 COLOR7 ENDCOLOR } # Source makepkg.conf file @@ -477,6 +479,7 @@ buildinstall() { elif [[ $2 = explicit ]]; then [[ $buildonly = 1 ]] && echo -e "${COLOR6}notice:${ENDCOLOR} $1 built -- not installing" [[ $buildonly = 1 ]] && bundle+=("$3") + [[ $buildonly != 1 ]] && progress "Installing ${pkgnum}/${totalcount} $1" [[ $buildonly != 1 ]] && runasroot $PACMAN ${PACOPTS[@]} -U "$3" fi } @@ -528,6 +531,36 @@ cacheinstall() { buildinstall $1 $2 $3 } +# Retrieve PGP keys ($@ is ${validpgpkeys[@]}) +addpgpkeys() { + if [[ $1 ]]; then + keyexists=$(gpg --fingerprint $@ 2>/dev/null) + if ! [[ $keyexists ]]; then + echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" + for pgpkey in $@; do + echo -e "\t${COLOR7}${pgpkey}${ENDCOLOR}" + done + echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " + if ! [[ $noconfirm ]]; then + proceed || exit + else + echo + fi + [ -f $HOME/.gnupg/gpg.conf ] || cp $gpgconf $HOME/.gnupg/ + gpg --recv-key $@ + echo + fi + fi +}; export -f addpgpkeys + +# Remove added PGP keys ($@ is ${validpgpkeys[@]}) +removepgpkeys() { + keycheck=$(gpg --fingerprint $@ 2>/dev/null) + if [[ $keycheck ]]; then + gpg --batch --yes --delete-keys $@ + fi +}; export -f removepgpkeys + # Installs packages from aur ($1 is package, $2 is dependency or explicit) aurinstall() { unset validpgpkeys @@ -574,39 +607,21 @@ aurinstall() { parser PKGBUILD confirm_edit "${COLOR6}Edit $install with \$editor? [Y/n]${ENDCOLOR} " "$install" - # Retrieve PGP keys - if [[ ${validpgpkeys[@]} ]]; then - keyexists=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) - if ! [[ $keyexists ]]; then - echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" - for pgpkey in ${validpgpkeys[@]}; do - echo -e "\t${COLOR7}${validpgpkeys[@]}${ENDCOLOR}" - done - echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " - if ! [[ $noconfirm ]]; then - proceed || exit - else - echo - fi - gpg --recv-key ${validpgpkeys[@]} - keycheck=$(gpg --fingerprint ${validpgpkeys[@]} 2>/dev/null) - echo - fi - fi - # Installation (makepkg and pacman) rm -f *$PKGEXT if [[ $UID -eq 0 ]]; then id aurbuild >/dev/null 2>/dev/null || useradd -r -d /var/empty aurbuild - chown -R aurbuild:aurbuild . + mkdir -p /var/empty/.gnupg + chown -R aurbuild:aurbuild . /var/empty/.gnupg + su -c "gpg --refresh-keys" aurbuild + #su -c "dirmngr Date: Wed, 20 May 2015 09:14:03 -0700 Subject: [PATCH 27/32] Another minor scope bugfix --- apacman | 1 + 1 file changed, 1 insertion(+) diff --git a/apacman b/apacman index fc8a1db..703a1d7 100755 --- a/apacman +++ b/apacman @@ -532,6 +532,7 @@ cacheinstall() { } # Retrieve PGP keys ($@ is ${validpgpkeys[@]}) +export gpgconf addpgpkeys() { if [[ $1 ]]; then keyexists=$(gpg --fingerprint $@ 2>/dev/null) From d1f3c078e959b58aca36be1a8aeaf4d0dbfe2ff6 Mon Sep 17 00:00:00 2001 From: brent s Date: Tue, 7 Jul 2015 04:41:13 -0400 Subject: [PATCH 28/32] fixing Issue #18 (https://github.com/oshazard/apacman/issues/18) gorram it. squashing commits for fix to #18: https://github.com/oshazard/apacman/issues/18 --- apacman | 2 +- apacman.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apacman b/apacman index 703a1d7..56429e4 100755 --- a/apacman +++ b/apacman @@ -408,7 +408,7 @@ abslink() { pkginfo() { if ! [[ -f "$tmpdir/$1.PKGBUILD" ]]; then pkgpath=$(pkglink $1) - curl -Lfs "${pkgpath%/*}/PKGBUILD" > "$tmpdir/$1.PKGBUILD" + curl -Lfs "${pkgpath%/*/*}/plain/PKGBUILD?h=${1}" > "$tmpdir/$1.PKGBUILD" if [[ $2 ]]; then # rename for syntax highlighting cp "$tmpdir/$1.PKGBUILD" "$tmpdir/PKGBUILD" diff --git a/apacman.conf b/apacman.conf index 1f7f272..6d1e235 100644 --- a/apacman.conf +++ b/apacman.conf @@ -36,8 +36,8 @@ #downdir="/var/cache/pacman/pkg" #savedir="/var/cache/apacman/pkg" #editor="nano -w" -#RPCURL="https://aur.archlinux.org/rpc.php?type" -#PKGURL="https://aur.archlinux.org" +#RPCURL="https://aur4.archlinux.org/rpc.php?type" +#PKGURL="https://aur4.archlinux.org" #ABSURL="rsync.archlinux.org" # From 562bfa3adaa5c34b1499ee23146e4b6ffe9f0a4e Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 8 Jul 2015 00:27:39 -0700 Subject: [PATCH 29/32] Update README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ca325f8..5c68545 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ apacman ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer +[Migrate wizard for AUR4](https://gist.github.com/oshazard/370c7ed631af2181ee51) + Features: * (**new**) Signed package support (WIP) * (**new**) Display [installed], [installed: VER], or [local: VER] in -Ss From a381dcb6ea83466bc1636a9c6602465d10cf0354 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Wed, 8 Jul 2015 04:35:52 -0700 Subject: [PATCH 30/32] Ver 1.9 - Better AUR4 support and --legacy flag for AUR3 backwards compat --- apacman | 37 ++++++++++++++++++++++++++----------- apacman.8 | 9 +++++++-- apacman.conf | 6 ++++-- apacman.conf.5 | 9 +++++++-- 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/apacman b/apacman index 56429e4..0c4079c 100755 --- a/apacman +++ b/apacman @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.8" +version="1.9" # Copyright OS Hazard # # New Features: @@ -11,6 +11,7 @@ version="1.8" # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --legacy backwards compatability for AUR3 # * --progress transaction status in terminal titlebar # * --nosource for security do not source PKGBUILDs (WIP) # * --buildonly create but do not install packages @@ -53,6 +54,8 @@ apacmanconf='/etc/apacman.conf' gpgconf='/etc/pacman.d/gnupg/gpg.conf' downdir='/var/cache/pacman/pkg' savedir='/var/cache/apacman/pkg' +builddir="${TMPDIR:-/tmp}/pkgbuild-$UID" +tmpdir="${TMPDIR:-/tmp}/apacmantmp-$UID" editor="vi" [[ $EDITOR ]] && editor="$EDITOR" @@ -60,11 +63,7 @@ editor="vi" RPCURL="https://aur.archlinux.org/rpc.php?type" PKGURL="https://aur.archlinux.org" ABSURL="rsync.archlinux.org" - -# set tmpfile stuff, clean tmpdir -tmpdir="${TMPDIR:-/tmp}/apacmantmp-$UID" -rm -rf "$tmpdir" &>/dev/null -mkdir -p "$tmpdir" +legacy="0" if [[ -t 1 && ! $COLOR = "NO" ]]; then COLOR1='\e[1;39m' @@ -130,6 +129,7 @@ usage() { echo ' --devel - update VCS (git, svn, hg) packages during -Su' echo ' --ignore - takes a comma-separated list of packages to ignore' echo ' --ignorearch - ignore a missing or incomplete architecture field' + echo ' --legacy - uses AUR3.0 instead of AUR4.0' echo ' --needed - do not install up-to-date packages' echo ' --noaur - do not actions for AUR' echo ' --noconfirm - do not prompt for any confirmation' @@ -161,12 +161,12 @@ varstatus() { } infoconf() { - vars="apacmanconf downdir editor makepkgconf pacmanconf savedir tmpdir usermakepkgconf" + vars="apacmanconf builddir downdir editor makepkgconf pacmanconf savedir tmpdir usermakepkgconf" for i in $vars; do varstatus $i done - vars="auronly buildonly cachevcs ignorearch needed noaur noconfirm noedit" + vars="auronly buildonly cachevcs ignorearch legacy needed noaur noconfirm noedit" vars="$vars nofail preview progress purgebuild quiet skipcache skipinteg skiptest warn" for j in $vars; do varstatus $j @@ -408,7 +408,12 @@ abslink() { pkginfo() { if ! [[ -f "$tmpdir/$1.PKGBUILD" ]]; then pkgpath=$(pkglink $1) - curl -Lfs "${pkgpath%/*/*}/plain/PKGBUILD?h=${1}" > "$tmpdir/$1.PKGBUILD" + if [[ $legacy == 1 ]]; then + curl -Lfs "${pkgpath%/*}/PKGBUILD" > "$tmpdir/$1.PKGBUILD" + else + curl -Lfs "${pkgpath%/*/*}/plain/PKGBUILD?h=${1}" > "$tmpdir/$1.PKGBUILD" + fi + if [[ $2 ]]; then # rename for syntax highlighting cp "$tmpdir/$1.PKGBUILD" "$tmpdir/PKGBUILD" @@ -565,7 +570,7 @@ removepgpkeys() { # Installs packages from aur ($1 is package, $2 is dependency or explicit) aurinstall() { unset validpgpkeys - dir="${TMPDIR:-/tmp}/pkgbuild-$UID/$1" + dir="${builddir}/$1" sourcemakepkgconf # Prepare the installation directory @@ -615,7 +620,6 @@ aurinstall() { mkdir -p /var/empty/.gnupg chown -R aurbuild:aurbuild . /var/empty/.gnupg su -c "gpg --refresh-keys" aurbuild - #su -c "dirmngr /dev/null +mkdir -p "$tmpdir" + # Determine architecture makearch=$(grep ^CARCH= "$makepkgconf" 2>/dev/null | grep -o -e =.*[0-9A-Za-z] | sed 's/^="//'); +# AUR4 compatibility +if [[ $legacy != 1 ]]; then + RPCURL=$(echo "$RPCURL" | sed 's/\./4&/1') + PKGURL=$(echo "$PKGURL" | sed 's/\./4&/1') +fi + # Check for new packages if [[ $quickcheck == 1 ]]; then run_quick_check diff --git a/apacman.8 b/apacman.8 index 0cebb56..9dbcbd6 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 05/19/2015 +.\" Date: 07/08/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "05/19/2015" "apacman" "apacman Manual" +.TH "APACMAN" "8" "07/08/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -107,6 +107,11 @@ Ignore packages\&. Separate package names with a comma\&. ignores architectures specified in PKGBUILD\&. .RE .PP +\fB\-\-legacy\fR +.RS 4 +Use AUR3 repo rather than default AUR4\&. +.RE +.PP \fB\-\-needed\fR .RS 4 Does not install up-to-date packages\&. diff --git a/apacman.conf b/apacman.conf index 6d1e235..fd9edf6 100644 --- a/apacman.conf +++ b/apacman.conf @@ -11,6 +11,7 @@ #buildonly=1 #cachevcs=1 #ignorearch=1 +#legacy=1 #needed=1 #noaur=1 #noconfirm=1 @@ -29,6 +30,7 @@ # CONFIGURATION # +#builddir="/tmp/pkgbuild-$UID" #tmpdir="/tmp/apacmantmp-$UID" #makepkgconf="/etc/makepkg.conf" #usermakepkgconf="$HOME/.makepkg.conf" @@ -36,8 +38,8 @@ #downdir="/var/cache/pacman/pkg" #savedir="/var/cache/apacman/pkg" #editor="nano -w" -#RPCURL="https://aur4.archlinux.org/rpc.php?type" -#PKGURL="https://aur4.archlinux.org" +#RPCURL="https://aur.archlinux.org/rpc.php?type" +#PKGURL="https://aur.archlinux.org" #ABSURL="rsync.archlinux.org" # diff --git a/apacman.conf.5 b/apacman.conf.5 index ac75b36..de50648 100644 --- a/apacman.conf.5 +++ b/apacman.conf.5 @@ -2,12 +2,12 @@ .\" Title: apacman.conf .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 05/19/2015 +.\" Date: 07/08/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN\&.CONF" "5" "05/19/2015" "apacman" "apacman Manual" +.TH "APACMAN\&.CONF" "5" "07/08/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -83,6 +83,11 @@ Installs cached VCS packages if newer than AUR PKGBUILD versions\&. Ignore missing architecture in PKGBUILD (mostly for ARM systems)\&. .RE .PP +\fBlegacy =\fR 1 +.RS 4 +Use AUR3 repo rather than AUR4\&. +.RE +.PP \fBneeded =\fR 1 .RS 4 Do not install up-to-date packages\&. From aa86d596eaf85fb993f7d7a5e4b6570c5fc2fd0f Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sun, 9 Aug 2015 17:44:56 -0700 Subject: [PATCH 31/32] v2.0 - Improved AUR4 and split package support --- README.md | 14 +++++-- apacman | 109 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 89 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 5c68545..ada454a 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,16 @@ ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer [Migrate wizard for AUR4](https://gist.github.com/oshazard/370c7ed631af2181ee51) Features: -* (**new**) Signed package support (WIP) -* (**new**) Display [installed], [installed: VER], or [local: VER] in -Ss -* (**new**) --progress parameter sets terminal title to package status -* (**new**) Add AUR link to -Si info +* Split package support and shared source +* Improved AUR4 support +* Bug fix for AUR4 -Si +* Bug fix for built/failed +* --legacy flag for AUR3 +* Preliminary AUR4 support +* Signed package support +* Display [installed], [installed: VER], or [local: VER] in -Ss +* --progress parameter sets terminal title to package status +* Add AUR link to -Si info * Bug fix for saved AUR packages and --cachevcs * Bug fix for pacmatic * Build status log diff --git a/apacman b/apacman index 0c4079c..fdca034 100755 --- a/apacman +++ b/apacman @@ -1,17 +1,19 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="1.9" +version="2.0" # Copyright OS Hazard # # New Features: +# * Split package support +# * AUR4 support # * Config file support -# * Signed package support (WIP) +# * Signed package support # * Built-in ABS support (WIP) # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable -# * --legacy backwards compatability for AUR3 +# * --legacy backwards compatability for AUR3 (deprecated) # * --progress transaction status in terminal titlebar # * --nosource for security do not source PKGBUILDs (WIP) # * --buildonly create but do not install packages @@ -185,6 +187,16 @@ runasroot() { fi } +# Extract from AUR4 .info +infoparser() { + pkgname=$(jshon -Qe results < $1 -Qe Name -u) + pkgver=$(jshon -Qe results < $1 -Qe Version -u) + pkgbase=$(jshon -Qe results < $1 -Qe PackageBase -u) + url=$(jshon -Qe results < $1 -Qe URL -u) + license=($(jshon -Qe results < $1 -Qe License -u)) + groups=$(jshon -Qe results < $1 -Qe PackageBase -u) +} + # FIXME parser() { if [ -f "$1" ]; then @@ -219,6 +231,11 @@ parser() { fi } +# grep PKGBUILD arrays ($1 is array var) +pkgbuildgrep() { + grep "^${1}=" PKGBUILD 2>/dev/null | awk -F = '{print $2}' | tr -dc 'a-z0-9-_. \n'; +} + # Source apacman.conf file sourceapacmanconf() { [[ -r "$apacmanconf" ]] && . "$apacmanconf" @@ -408,10 +425,11 @@ abslink() { pkginfo() { if ! [[ -f "$tmpdir/$1.PKGBUILD" ]]; then pkgpath=$(pkglink $1) + basepath=$(echo ${pkgpath##*/} | awk -F . '{print $1}') if [[ $legacy == 1 ]]; then curl -Lfs "${pkgpath%/*}/PKGBUILD" > "$tmpdir/$1.PKGBUILD" else - curl -Lfs "${pkgpath%/*/*}/plain/PKGBUILD?h=${1}" > "$tmpdir/$1.PKGBUILD" + curl -Lfs "${pkgpath%/*/*}/plain/PKGBUILD?h=${basepath}" > "$tmpdir/$1.PKGBUILD" fi if [[ $2 ]]; then @@ -575,12 +593,12 @@ aurinstall() { # Prepare the installation directory # If there is an old directory and aurversion is not newer, use old directory - if parser "$dir/$1/PKGBUILD" &>/dev/null && ! aurversionisnewer "$1" "$pkgver-$pkgrel"; then - cd "$dir/$1" + if parser "$dir/PKGBUILD" &>/dev/null && ! aurversionisnewer "$1" "$pkgver-$pkgrel"; then + cd "$dir" else [[ -d "$dir" ]] && rm -rf "$dir" - mkdir -p "$dir" - cd "$dir" + mkdir -p "$builddir" + cd "$builddir" curl -Lfs "$(pkglink $1)" > "$1.tar.gz" mkdir "$1" tar xf "$1.tar.gz" -C "$1" --strip-components=1 @@ -595,7 +613,23 @@ aurinstall() { fi fi - # check for missing arch + # Check for split PKGBUILD + unset pkgtarget + pkgbase=($(pkgbuildgrep pkgbase)); + pkgname=($(pkgbuildgrep pkgname)); + if [[ "${pkgbase[@]}" ]]; then + echo -e " ${COLOR5}->${ENDCOLOR}${COLOR1} Split package base: ${pkgbase[@]}${ENDCOLOR}"; + if [[ "${#pkgname[@]}" -gt 1 ]]; then + echo -e " ${COLOR5}->${ENDCOLOR}${COLOR1} PKGBUILD contains: ${pkgname[@]}${ENDCOLOR}"; + pkgtarget="--pkg $1" + for split in ${pkgname[@]}; do + ln -s "${builddir}/$1" "${builddir}/$split" 2>/dev/null; + done + fi + fi + + # Check for missing arch + arch=($(pkgbuildgrep arch)); if [[ ! " ${arch[@]} " =~ " any " ]]; then if [[ ! " ${arch[@]} " =~ " ${CARCH} " ]]; then echo -e "${COLOR6}warning:$ENDCOLOR $CARCH missing from arch array" @@ -621,16 +655,16 @@ aurinstall() { chown -R aurbuild:aurbuild . /var/empty/.gnupg su -c "gpg --refresh-keys" aurbuild su -c "addpgpkeys ${validpgpkeys[@]}" aurbuild - su -c "makepkg $MAKEPKGOPTS -f" aurbuild + su -c "makepkg $MAKEPKGOPTS $pkgtarget -f" aurbuild; buildcheck=$? su -c "removepgpkeys ${validpgpkeys[@]}" aurbuild else addpgpkeys "${validpgpkeys[@]}" - makepkg $MAKEPKGOPTS -f + makepkg $MAKEPKGOPTS $pkgtarget -f; buildcheck=$? removepgpkeys "${validpgpkeys[@]}" fi # Build check - if [[ $? -ne 0 ]]; then + if [[ $buildcheck -ne 0 ]]; then failure+=("$1") buildstatus 1 else @@ -638,19 +672,18 @@ aurinstall() { buildstatus 0 fi - pkgtarfiles="" - for i in "${pkgname[@]}"; do - pkgtarfiles="$pkgtarfiles $i-*$PKGEXT" - done + #pkgtarfiles="" + #for i in "${pkgname[@]}"; do + # pkgtarfiles="$pkgtarfiles $i-*$PKGEXT" + #done # Save packages - pkgtar=$(ls $pkgname-*$PKGEXT 2>/dev/null | tail -n 1) + pkgtar=$(ls $1-*$PKGEXT 2>/dev/null | tail -n 1) if [[ $pkgtar ]]; then [ -d $savedir ] || runasroot mkdir -p $savedir - runasroot cp $pkgname-*$PKGEXT $savedir/ - echo -e "${COLOR5} -> ${COLOR1}Saved package:${ENDCOLOR} $(ls $pkgname-*$PKGEXT)"; - pkgfilename=$(ls $pkgname-*$PKGEXT) - buildinstall $pkgname $2 ${savedir}/$pkgfilename + runasroot cp ${pkgtar} $savedir/ + echo -e "${COLOR5} -> ${COLOR1}Saved package:${ENDCOLOR} ${pkgtar}"; + buildinstall $1 $2 ${savedir}/$pkgtar fi } @@ -843,13 +876,24 @@ run_quick_check() { } # proceed with installation prompt +#proceed() { +# read -n 1 +# echo +# case "$REPLY" in +# 'Y'|'y'|'') return 0 ;; +# *) return 1 ;; +# esac +#}; + proceed() { - read -n 1 + unset INPUT + read -n 1 INPUT echo - case "$REPLY" in - 'Y'|'y'|'') return 0 ;; - *) return 1 ;; - esac + if [[ "$INPUT" = [yY] ]]; then + return 0; + else + return 1; + fi }; export -f proceed # process busy loop @@ -931,10 +975,10 @@ mkdir -p "$tmpdir" makearch=$(grep ^CARCH= "$makepkgconf" 2>/dev/null | grep -o -e =.*[0-9A-Za-z] | sed 's/^="//'); # AUR4 compatibility -if [[ $legacy != 1 ]]; then - RPCURL=$(echo "$RPCURL" | sed 's/\./4&/1') - PKGURL=$(echo "$PKGURL" | sed 's/\./4&/1') -fi +#if [[ $legacy != 1 ]]; then +# RPCURL=$(echo "$RPCURL" | sed 's/\./4&/1') +# PKGURL=$(echo "$PKGURL" | sed 's/\./4&/1') +#fi # Check for new packages if [[ $quickcheck == 1 ]]; then @@ -957,6 +1001,11 @@ fi # Install (-S) handling if [[ $option = install ]]; then + for pkg in ${packageargs[@]}; do + if [[ "$pkg" =~ ^/ ]]; then + err "${COLOR7}error:${ENDCOLOR} invalid package name $pkg" + fi + done installhandling "${packageargs[@]}" exit fi From 022c4043c3025cb71e14e0708f5a86afc14a77d5 Mon Sep 17 00:00:00 2001 From: OS Hazard Date: Sat, 5 Sep 2015 22:10:39 -0700 Subject: [PATCH 32/32] Ver 2.1 - fixes for PGP, piping and prompt --- README.md | 5 ++ apacman | 135 ++++++++++++++++++++++++++++--------------------- apacman.8 | 16 ++++-- apacman.conf | 1 + apacman.conf.5 | 11 ++-- 5 files changed, 105 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index ada454a..fbed25d 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,11 @@ ArchLinux User Repository (AUR) helper and pacman wrapper forked from packer [Migrate wizard for AUR4](https://gist.github.com/oshazard/370c7ed631af2181ee51) Features: +* **NEW** improved signed package support +* **NEW** --keepkeys parameter stores PGP keys +* **NEW** --purgekeys parameter removes trusted PGP keys +* **NEW** fix for piping output +* **NEW** fix for yes/no dialog * Split package support and shared source * Improved AUR4 support * Bug fix for AUR4 -Si diff --git a/apacman b/apacman index fdca034..4b81dcc 100755 --- a/apacman +++ b/apacman @@ -1,18 +1,20 @@ #!/bin/bash ###################################################################### # apacman - AUR wrapper forked from packer -version="2.0" +version="2.1" # Copyright OS Hazard # # New Features: +# * Signed package support (improved) # * Split package support # * AUR4 support # * Config file support -# * Signed package support # * Built-in ABS support (WIP) # * Workaround for running as root # * Saves AUR packages to /var/cache/apacman/pkg # * Uses AUR package cache directory if applicable +# * --keepkeys do not remove imported PGP keys +# * --purgekeys remove imported PGP keys # * --legacy backwards compatability for AUR3 (deprecated) # * --progress transaction status in terminal titlebar # * --nosource for security do not source PKGBUILDs (WIP) @@ -131,7 +133,8 @@ usage() { echo ' --devel - update VCS (git, svn, hg) packages during -Su' echo ' --ignore - takes a comma-separated list of packages to ignore' echo ' --ignorearch - ignore a missing or incomplete architecture field' - echo ' --legacy - uses AUR3.0 instead of AUR4.0' + echo ' --keepkeys - do not remove imported PGP keys' + echo ' --legacy - uses AUR3.0 instead of AUR4.0 (deprecated)' echo ' --needed - do not install up-to-date packages' echo ' --noaur - do not actions for AUR' echo ' --noconfirm - do not prompt for any confirmation' @@ -141,6 +144,7 @@ usage() { echo ' --preview - edit pkgbuild before sourcing' echo ' --progress - transaction status in terminal titlebar' echo ' --purgebuild - remove unneeded build dependencies' + echo ' --purgekeys - remove trusted PGP keys' echo ' --quickcheck - check for updates and exit' echo ' --quiet - only output package name for searches' echo ' --skipcache - skips check for pre-built package in cache directory' @@ -168,8 +172,8 @@ infoconf() { varstatus $i done - vars="auronly buildonly cachevcs ignorearch legacy needed noaur noconfirm noedit" - vars="$vars nofail preview progress purgebuild quiet skipcache skipinteg skiptest warn" + vars="auronly buildonly cachevcs ignorearch keepkeys legacy needed noaur noconfirm noedit" + vars="$vars nofail preview progress purgebuild purgekeys quiet skipcache skipinteg skiptest warn" for j in $vars; do varstatus $j done @@ -244,7 +248,7 @@ sourceapacmanconf() { [[ $skiptest ]] && MAKEPKGOPTS+=("--nocheck") [[ $skipinteg ]] && MAKEPKGOPTS+=("--skipinteg") [[ $ignorearch ]] && MAKEPKGOPTS+=("--ignorearch") - export noconfirm COLOR1 COLOR2 COLOR3 COLOR4 COLOR5 COLOR6 COLOR7 ENDCOLOR + export keepkeys noconfirm COLOR1 COLOR2 COLOR3 COLOR4 COLOR5 COLOR6 COLOR7 ENDCOLOR } # Source makepkg.conf file @@ -556,32 +560,43 @@ cacheinstall() { # Retrieve PGP keys ($@ is ${validpgpkeys[@]}) export gpgconf -addpgpkeys() { +checkpgpkeys() { if [[ $1 ]]; then - keyexists=$(gpg --fingerprint $@ 2>/dev/null) - if ! [[ $keyexists ]]; then - echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" - for pgpkey in $@; do - echo -e "\t${COLOR7}${pgpkey}${ENDCOLOR}" - done - echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " - if ! [[ $noconfirm ]]; then - proceed || exit - else - echo - fi - [ -f $HOME/.gnupg/gpg.conf ] || cp $gpgconf $HOME/.gnupg/ - gpg --recv-key $@ - echo - fi + gpg --fingerprint $@ 2>/dev/null fi +}; export -f checkpgpkeys + +# Prompt to import PGP keys ($@ is ${validpgpkeys[@]}) +askpgpkeys() { + echo -e "\n${COLOR6}warning:${ENDCOLOR} One or more PGP signatures unknown" + for pgpkey in $@; do + echo -e "\t${COLOR7}${pgpkey}${ENDCOLOR}" + done + echo -en "${COLOR5}:: ${COLOR1}Verify PGP keys? [Y/n]${ENDCOLOR} " + if ! [[ $noconfirm ]]; then + proceed || exit + else + echo + fi +}; export -f askpgpkeys + +# Import PGP keys ($@ is ${validpgpkeys[@]}) +addpgpkeys() { + [ -f $HOME/.gnupg/gpg.conf ] || cp $gpgconf $HOME/.gnupg/ + for pgpkey in $@; do + echo -e "${COLOR6}trusting:${ENDCOLOR} ${COLOR7}${pgpkey}${ENDCOLOR}" + gpg --recv-key $pgpkey + done }; export -f addpgpkeys # Remove added PGP keys ($@ is ${validpgpkeys[@]}) removepgpkeys() { - keycheck=$(gpg --fingerprint $@ 2>/dev/null) - if [[ $keycheck ]]; then + if ! [[ $keepkeys ]]; then + keycheck=$(gpg --fingerprint $@ 2>/dev/null) + if [[ $keycheck ]]; then + echo -e "${COLOR5} -> ${COLOR1}Removed $# trusted keys${ENDCOLOR}" gpg --batch --yes --delete-keys $@ + fi fi }; export -f removepgpkeys @@ -653,14 +668,34 @@ aurinstall() { id aurbuild >/dev/null 2>/dev/null || useradd -r -d /var/empty aurbuild mkdir -p /var/empty/.gnupg chown -R aurbuild:aurbuild . /var/empty/.gnupg - su -c "gpg --refresh-keys" aurbuild - su -c "addpgpkeys ${validpgpkeys[@]}" aurbuild - su -c "makepkg $MAKEPKGOPTS $pkgtarget -f" aurbuild; buildcheck=$? - su -c "removepgpkeys ${validpgpkeys[@]}" aurbuild + + if [[ $validpgpkeys ]]; then + su aurbuild -c "gpg --refresh-keys ${validpgpkeys[*]}" + keyfound=$(su aurbuild -c "checkpgpkeys ${validpgpkeys[*]}" 2>/dev/null) + if ! [[ $keyfound ]]; then + askpgpkeys "${validpgpkeys[*]}" + su aurbuild -c "addpgpkeys ${validpgpkeys[*]}" + fi + su aurbuild -c "makepkg $MAKEPKGOPTS $pkgtarget -f"; buildcheck=$? + [[ $keyfound ]] || su aurbuild -c "removepgpkeys ${validpgpkeys[*]}" + [[ $purgekeys ]] && [[ $keyfound ]] && su aurbuild -c "removepgpkeys ${validpgpkeys[*]}" + else + su aurbuild -c "makepkg $MAKEPKGOPTS $pkgtarget -f"; buildcheck=$? + fi else - addpgpkeys "${validpgpkeys[@]}" - makepkg $MAKEPKGOPTS $pkgtarget -f; buildcheck=$? - removepgpkeys "${validpgpkeys[@]}" + if [[ $validpgpkeys ]]; then + gpg --refresh-keys "${validpgpkeys[@]}" + keyfound=$(checkpgpkeys "${validpgpkeys[@]}" 2>/dev/null) + if ! [[ $keyfound ]]; then + askpgpkeys "${validpgpkeys[@]}" + addpgpkeys "${validpgpkeys[@]}" + fi + makepkg $MAKEPKGOPTS $pkgtarget -f; buildcheck=$? + [[ $keyfound ]] || removepgpkeys "${validpgpkeys[@]}" + [[ $purgekeys ]] && [[ $keyfound ]] && removepgpkeys "${validpgpkeys[@]}" + else + makepkg $MAKEPKGOPTS $pkgtarget -f; buildcheck=$? + fi fi # Build check @@ -672,16 +707,11 @@ aurinstall() { buildstatus 0 fi - #pkgtarfiles="" - #for i in "${pkgname[@]}"; do - # pkgtarfiles="$pkgtarfiles $i-*$PKGEXT" - #done - # Save packages pkgtar=$(ls $1-*$PKGEXT 2>/dev/null | tail -n 1) if [[ $pkgtar ]]; then [ -d $savedir ] || runasroot mkdir -p $savedir - runasroot cp ${pkgtar} $savedir/ + runasroot cp ${pkgtar} $savedir/ && echo -e "${COLOR5} -> ${COLOR1}Saved package:${ENDCOLOR} ${pkgtar}"; buildinstall $1 $2 ${savedir}/$pkgtar fi @@ -876,24 +906,13 @@ run_quick_check() { } # proceed with installation prompt -#proceed() { -# read -n 1 -# echo -# case "$REPLY" in -# 'Y'|'y'|'') return 0 ;; -# *) return 1 ;; -# esac -#}; - proceed() { - unset INPUT - read -n 1 INPUT + read -n 1 echo - if [[ "$INPUT" = [yY] ]]; then - return 0; - else - return 1; - fi + case "$REPLY" in + 'Y'|'y'|'') return 0 ;; + *) return 1 ;; + esac }; export -f proceed # process busy loop @@ -932,6 +951,7 @@ while [[ $1 ]]; do '--devel') devel='1' ;; '--ignore') ignorearg="$2" ; PACOPTS+=("--ignore" "$2") ; shift ;; '--ignorearch') MAKEPKGOPTS+=("--ignorearch");; + '--keepkeys') keepkeys='1' ; export keepkeys ;; '--legacy') legacy='1' ;; '--needed') needed='1' PACOPTS+=("--needed");; '--noaur') noaur='1' ; unset auronly ;; @@ -942,6 +962,7 @@ while [[ $1 ]]; do '--preview') preview='1' ;; '--progress') progress='1' ;; '--purgebuild') purgebuild='1' ;; + '--purgekeys') purgekeys='1' ;; '--quickcheck') quickcheck='1' ;; '--quiet') quiet='1' ;; '--skipcache') skipcache='1' ;; @@ -1141,7 +1162,7 @@ if [[ $option = search || $option = searchinstall ]]; then results="$($pacmanbin -Ss -- "${packageargs[@]}")" results="$(sed -r "s|^[^ ][^/]*/|$S${COLOR3}&$S${COLOR1}|" <<< "$results")" results="$(sed -r "s|^([^ ]+) ([^ ]+)(.*)$|\1 $S${COLOR2}\2$S${ENDCOLOR}\3|" <<< "$results")" - results="$(sed -e "s| \[|\\${COLOR4}&|" -e "s|\]|&\\${ENDCOLOR}|" <<< "$results")" + results="$(sed -e "s| \[|$S${COLOR4}&|" -e "s|\]|&$S${ENDCOLOR}|" <<< "$results")" fi if [[ $option = search ]]; then echo -e "$results" | fmt -"$_WIDTH" -s @@ -1200,7 +1221,7 @@ if [[ $option = search || $option = searchinstall ]]; then printf "%s\n" ${aurname[@]} elif [[ -s "$tmpdir/search.results" ]]; then resultsaur="$(printf "${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(cat "$tmpdir/search.results"))" - resultsaur="$(sed -e "s| \[|\\${COLOR4}&|" -e "s|\] |&\\${ENDCOLOR}|" <<< "$resultsaur")" + resultsaur="$(sed -e "s| \[|$S${COLOR4}&|" -e "s|\]|&$S${ENDCOLOR}|" <<< "$resultsaur")" echo -e "$resultsaur" fi else @@ -1209,7 +1230,7 @@ if [[ $option = search || $option = searchinstall ]]; then nl -v ${pactotal:-0} -w 1 -s ' ' <(cut -f 1 "$tmpdir/search.results") elif [[ -s "$tmpdir/search.results" ]]; then resultsaur="$(printf "%d ${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results"))" - resultsaur="$(sed -e "s| \[|\\${COLOR4}&|" -e "s|\] |&\\${ENDCOLOR}|" <<< "$resultsaur")" + resultsaur="$(sed -e "s| \[|$S${COLOR4}&|" -e "s|\] |&$S${ENDCOLOR}|" <<< "$resultsaur")" echo -e "$resultsaur" fi fi | fmt -"$_WIDTH" -s diff --git a/apacman.8 b/apacman.8 index 9dbcbd6..c8bd6d3 100644 --- a/apacman.8 +++ b/apacman.8 @@ -2,12 +2,12 @@ .\" Title: apacman .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 07/08/2015 +.\" Date: 09/05/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN" "8" "07/08/2015" "apacman" "apacman Manual" +.TH "APACMAN" "8" "09/05/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -107,9 +107,14 @@ Ignore packages\&. Separate package names with a comma\&. ignores architectures specified in PKGBUILD\&. .RE .PP +\fB\-\-keepkeys\fR +.RS 4 +Do not remove imported PGP keys\&. +.RE +.PP \fB\-\-legacy\fR .RS 4 -Use AUR3 repo rather than default AUR4\&. +Use AUR3 repo rather than default AUR4 (deprecated)\&. .RE .PP \fB\-\-needed\fR @@ -152,6 +157,11 @@ Terminal title transaction status\&. Post\-install remove unneeded build makedepends\&. .RE .PP +\fB\-\-purgekeys\fR +.RS 4 +Remove trusted PGP keys\&. +.RE +.PP \fB\-\-quickcheck\fR .RS 4 Check for updates and exit\&. diff --git a/apacman.conf b/apacman.conf index fd9edf6..ec12840 100644 --- a/apacman.conf +++ b/apacman.conf @@ -11,6 +11,7 @@ #buildonly=1 #cachevcs=1 #ignorearch=1 +#keepkeys=1 #legacy=1 #needed=1 #noaur=1 diff --git a/apacman.conf.5 b/apacman.conf.5 index de50648..b53f8bc 100644 --- a/apacman.conf.5 +++ b/apacman.conf.5 @@ -2,12 +2,12 @@ .\" Title: apacman.conf .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 07/08/2015 +.\" Date: 09/05/2015 .\" Manual: apacman Manual .\" Source: apacman .\" Language: English .\" -.TH "APACMAN\&.CONF" "5" "07/08/2015" "apacman" "apacman Manual" +.TH "APACMAN\&.CONF" "5" "09/05/2015" "apacman" "apacman Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -83,9 +83,14 @@ Installs cached VCS packages if newer than AUR PKGBUILD versions\&. Ignore missing architecture in PKGBUILD (mostly for ARM systems)\&. .RE .PP +\fBkeepkeys =\fR 1 +.RS 4 +Do not remove imported PGP keys\&. +.RE +.PP \fBlegacy =\fR 1 .RS 4 -Use AUR3 repo rather than AUR4\&. +Use AUR3 repo rather than AUR4 (deprecated)\&. .RE .PP \fBneeded =\fR 1