From da86887fdb9bde1fad43a27efcede69259131180 Mon Sep 17 00:00:00 2001 From: icymatter Date: Mon, 3 Jan 2022 12:42:59 +0100 Subject: [PATCH 1/2] Release v3.0.6 with Void Linux support --- .github/workflows/ci.yaml | 6 ++ CHANGELOG.md | 4 ++ README.md | 112 +++++++++++++++++++------------------- 3 files changed, 67 insertions(+), 55 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1642774..9a19a65 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -79,6 +79,12 @@ jobs: - uses: actions/checkout@v2 - run: make tests TESTS=swupd + xbps: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: make tests TESTS=xbps + others: runs-on: ubuntu-latest steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ccb60d..8842688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v3.0.6 + +* New support `Void Linux` (Thanks Tabulate @TabulateJarl8) + ## v3.0.5 * `lib/apt-cyg`: Add initial support for `apt-cyg` on Cygwin systems diff --git a/README.md b/README.md index bdade79..ce89dc1 100644 --- a/README.md +++ b/README.md @@ -7,24 +7,25 @@ Simply install package with `pacapt -S htop` or `pacapt install htop` on any `Linux`, `BSD`, `OpenWrt` or `Mac OS` machines. It supports the following package managers: -* `pacman` on `Arch Linux`-based systems, `ArchBang`, `Manjaro`, etc. -* `apt-cyg` on Cygwin (via [apt-cyg](https://github.com/transcode-open/apt-cyg)) -* `apt-get` on `Debian`, `Ubuntu`, etc. -* `homebrew` on `Mac OS X` -* `macports` on `Mac OS X` -* `yum/rpm` by `Redhat`, `CentOS`, `Fedora`, `Oracle Linux`, etc. -* `portage` by `Gentoo` -* `zypper` by `OpenSUSE` -* `pkgng` by `FreeBSD` -* `cave` by `Exherbo Linux` -* `pkg_tools` by `OpenBSD` -* `sun_tools` by `Solaris(SunOS)` -* `apk` by `Alpine Linux` -* `opkg` by `OpenWrt` -* `tazpkg` by `SliTaz Linux` -* `swupd` by `Clear Linux` -* `tlmgr` by `TeX Live` -* `conda` by [`Conda`](https://conda.io/docs/) +* `pacman` from `Arch Linux`-based systems, `ArchBang`, `Manjaro`, etc. +* `apt-cyg` from Cygwin (via [apt-cyg](https://github.com/transcode-open/apt-cyg)) +* `apt-get` from `Debian`, `Ubuntu`, etc. +* `homebrew` from `Mac OS X` +* `macports` from `Mac OS X` +* `yum/rpm` from `Redhat`, `CentOS`, `Fedora`, `Oracle Linux`, etc. +* `portage` from `Gentoo` +* `zypper` from `OpenSUSE` +* `pkgng` from `FreeBSD` +* `cave` from `Exherbo Linux` +* `pkg_tools` from `OpenBSD` +* `sun_tools` from `Solaris(SunOS)` +* `apk` from `Alpine Linux` +* `opkg` from `OpenWrt` +* `tazpkg` from `SliTaz Linux` +* `swupd` from `Clear Linux` +* `xbps` from `Void Linux` +* `tlmgr` from `TeX Live` +* `conda` from [`Conda`](https://conda.io/docs/) ## TOC @@ -116,22 +117,22 @@ A long list of options and operations can be found from [`ArchLinux`'s wiki](htt ``` Q Qc Qe Qi Qk Ql Qm Qo Qp Qs Qu R Rn Rns Rs S Sc Scc Sccc Sg Si Sii Sl Ss Su Suy Sy U apk ~ * * * * * * * * * * * * * * * * * * * * * * - apt_cyg * * * * * * * + apt_cyg * * * * * * * cave * * * * * * * * * * * * * * x * * * * * x - conda * * * * * * * * + conda * * * * * * * * dnf ~ * * * * * * * * * * * * * * * * * * * * * * * dpkg ~ * * * * * * * * * * * * ~ * * * * * * * * * * * * - homebrew * * * * * * * * * * * * * * * * - macports * * * * * ~ * * * * * * * * + homebrew * * * * * * * * * * * * * * * * + macports * * * * * ~ * * * * * * * * opkg * * * * * * * * * * * * * * - pkgng * * * * * * * * * * * * * * * * -pkg_tools ~ * * * * * * * * ~ * * x * * ~ * * x - portage * * * * * * * * * * * * * * * * * + pkgng * * * * * * * * * * * * * * * * +pkg_tools ~ * * * * * * * * ~ * * x * * ~ * * x + portage * * * * * * * * * * * * * * * * * sun_tools * * * * * * * - swupd * * * * * * * * * * * * * + swupd * * * * * * * * * * * * * tazpkg * * * * * * * * * * * * * tlmgr * * * * * * * * * * - xbps * * * * * * * * * * * * * + xbps * * * * * * * * * * * * * yum * * * * * * * * * * * * * * * * * * * * * * * * zypper * * * * * * * * * * * * * * * * * * * * * * * * * * ``` @@ -193,32 +194,33 @@ Many people have contributed to the project by sending pull requests and/or reporting on the ticket system. Here is an incomplete list of authors and contributors. -* 10sr (10sr) -* Alexander Dupuy (dupuy) -* Anh K. Huynh (icy) -* Antony Lee (anntzer) -* Alex Lyon (Arcterus) -* Álvaro Mondéjar (mondeja) -* Carl X. Su (bcbcarl) -* Cuong Manh Le (Gnouc) -* Daniel YC Lin (dlintw) -* Danny George (dangets) -* Darshit Shah (darnir) -* Dmitry Kudriavtsev (dkudriavtsev) -* Eric Crosson (EricCrosson) -* Evan Relf (evanrelf) -* GijsTimmers (GijsTimmers) -* Hà-Dương Nguyễn (cmpitg) -* Huy Ngô (NgoHuy) -* James Pearson (xiongchiamiov) -* Janne Heß (dasJ) -* Jiawei Zhou (4679) +* 10sr (@10sr) +* Alexander Dupuy (@dupuy) +* Anh K. Huynh (@icy) +* Antony Lee (@anntzer) +* Alex Lyon (@Arcterus) +* Álvaro Mondéjar (@mondeja) +* Carl X. Su (@bcbcarl) +* Cuong Manh Le (@Gnouc) +* Daniel YC Lin (@dlintw) +* Danny George (@dangets) +* Darshit Shah (@darnir) +* Dmitry Kudriavtsev (@dkudriavtsev) +* Eric Crosson (@EricCrosson) +* Evan Relf (@evanrelf) +* GijsTimmers (@GijsTimmers) +* Hà-Dương Nguyễn (@cmpitg) +* Huy Ngô (@NgoHuy) +* James Pearson (@xiongchiamiov) +* Janne Heß (@dasJ) +* Jiawei Zhou (@4679) * Karol Blazewicz -* Kevin Brubeck (unhammer) -* Konrad Borowski (xfix) -* Kylie McClain (somasis) -* Gen Li (Rami3L) -* Valerio Pizzi (Pival81) -* Siôn Le Roux (sinisterstuf) -* Thiago Perrotta (thiagowfx) -* Vojtech Letal (letalvoj) +* Kevin Brubeck (@unhammer) +* Konrad Borowski (@xfix) +* Kylie McClain (@somasis) +* Gen Li (@Rami3L) +* Valerio Pizzi (@Pival81) +* Siôn Le Roux (@sinisterstuf) +* Tabulate (@TabulateJarl8) +* Thiago Perrotta (@thiagowfx) +* Vojtech Letal (@letalvoj) From 7cfa046010d90a132ba396ff37e34728ccdfbfcb Mon Sep 17 00:00:00 2001 From: icymatter Date: Mon, 3 Jan 2022 12:44:15 +0100 Subject: [PATCH 2/2] pacapt: re-generated with new version=3.0.6 --- pacapt | 201 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 139 insertions(+), 62 deletions(-) diff --git a/pacapt b/pacapt index a71496a..cb95570 100755 --- a/pacapt +++ b/pacapt @@ -3,39 +3,40 @@ # Purpose: A wrapper for all Unix package managers # License: Fair license (http://www.opensource.org/licenses/fair) # Source : http://github.com/icy/pacapt/ -# Version: 3.0.5 +# Version: 3.0.6 # Authors: Anh K. Huynh et al. -# Copyright (C) 2010 - 2021 \ -# | 10sr (10sr) -# | Alexander Dupuy (dupuy) -# | Anh K. Huynh (icy) -# | Antony Lee (anntzer) -# | Alex Lyon (Arcterus) -# | Álvaro Mondéjar (mondeja) -# | Carl X. Su (bcbcarl) -# | Cuong Manh Le (Gnouc) -# | Daniel YC Lin (dlintw) -# | Danny George (dangets) -# | Darshit Shah (darnir) -# | Dmitry Kudriavtsev (dkudriavtsev) -# | Eric Crosson (EricCrosson) -# | Evan Relf (evanrelf) -# | GijsTimmers (GijsTimmers) -# | Hà-Dương Nguyễn (cmpitg) -# | Huy Ngô (NgoHuy) -# | James Pearson (xiongchiamiov) -# | Janne Heß (dasJ) -# | Jiawei Zhou (4679) +# Copyright (C) 2010 - 2022 \ +# | 10sr (@10sr) +# | Alexander Dupuy (@dupuy) +# | Anh K. Huynh (@icy) +# | Antony Lee (@anntzer) +# | Alex Lyon (@Arcterus) +# | Álvaro Mondéjar (@mondeja) +# | Carl X. Su (@bcbcarl) +# | Cuong Manh Le (@Gnouc) +# | Daniel YC Lin (@dlintw) +# | Danny George (@dangets) +# | Darshit Shah (@darnir) +# | Dmitry Kudriavtsev (@dkudriavtsev) +# | Eric Crosson (@EricCrosson) +# | Evan Relf (@evanrelf) +# | GijsTimmers (@GijsTimmers) +# | Hà-Dương Nguyễn (@cmpitg) +# | Huy Ngô (@NgoHuy) +# | James Pearson (@xiongchiamiov) +# | Janne Heß (@dasJ) +# | Jiawei Zhou (@4679) # | Karol Blazewicz -# | Kevin Brubeck (unhammer) -# | Konrad Borowski (xfix) -# | Kylie McClain (somasis) -# | Gen Li (Rami3L) -# | Valerio Pizzi (Pival81) -# | Siôn Le Roux (sinisterstuf) -# | Thiago Perrotta (thiagowfx) -# | Vojtech Letal (letalvoj) +# | Kevin Brubeck (@unhammer) +# | Konrad Borowski (@xfix) +# | Kylie McClain (@somasis) +# | Gen Li (@Rami3L) +# | Valerio Pizzi (@Pival81) +# | Siôn Le Roux (@sinisterstuf) +# | Tabulate (@TabulateJarl8) +# | Thiago Perrotta (@thiagowfx) +# | Vojtech Letal (@letalvoj) # # Usage of the works is permitted provided that this instrument is # retained with the works, so that any entity that uses the works is @@ -46,38 +47,39 @@ _print_pacapt_version() { cat <<_EOF_ -pacapt version '3.0.5' - -Copyright (C) 2010 - 2021 \\ - | 10sr (10sr) - | Alexander Dupuy (dupuy) - | Anh K. Huynh (icy) - | Antony Lee (anntzer) - | Alex Lyon (Arcterus) - | Álvaro Mondéjar (mondeja) - | Carl X. Su (bcbcarl) - | Cuong Manh Le (Gnouc) - | Daniel YC Lin (dlintw) - | Danny George (dangets) - | Darshit Shah (darnir) - | Dmitry Kudriavtsev (dkudriavtsev) - | Eric Crosson (EricCrosson) - | Evan Relf (evanrelf) - | GijsTimmers (GijsTimmers) - | Hà-Dương Nguyễn (cmpitg) - | Huy Ngô (NgoHuy) - | James Pearson (xiongchiamiov) - | Janne Heß (dasJ) - | Jiawei Zhou (4679) +pacapt version '3.0.6' + +Copyright (C) 2010 - 2022 \\ + | 10sr (@10sr) + | Alexander Dupuy (@dupuy) + | Anh K. Huynh (@icy) + | Antony Lee (@anntzer) + | Alex Lyon (@Arcterus) + | Álvaro Mondéjar (@mondeja) + | Carl X. Su (@bcbcarl) + | Cuong Manh Le (@Gnouc) + | Daniel YC Lin (@dlintw) + | Danny George (@dangets) + | Darshit Shah (@darnir) + | Dmitry Kudriavtsev (@dkudriavtsev) + | Eric Crosson (@EricCrosson) + | Evan Relf (@evanrelf) + | GijsTimmers (@GijsTimmers) + | Hà-Dương Nguyễn (@cmpitg) + | Huy Ngô (@NgoHuy) + | James Pearson (@xiongchiamiov) + | Janne Heß (@dasJ) + | Jiawei Zhou (@4679) | Karol Blazewicz - | Kevin Brubeck (unhammer) - | Konrad Borowski (xfix) - | Kylie McClain (somasis) - | Gen Li (Rami3L) - | Valerio Pizzi (Pival81) - | Siôn Le Roux (sinisterstuf) - | Thiago Perrotta (thiagowfx) - | Vojtech Letal (letalvoj) + | Kevin Brubeck (@unhammer) + | Konrad Borowski (@xfix) + | Kylie McClain (@somasis) + | Gen Li (@Rami3L) + | Valerio Pizzi (@Pival81) + | Siôn Le Roux (@sinisterstuf) + | Tabulate (@TabulateJarl8) + | Thiago Perrotta (@thiagowfx) + | Vojtech Letal (@letalvoj) Usage of the works is permitted provided that this instrument is retained with the works, so that any @@ -87,7 +89,7 @@ DISCLAIMER: THE WORKS ARE WITHOUT WARRANTY. _EOF_ } -export PACAPT_VERSION='3.0.5' +export PACAPT_VERSION='3.0.6' _help() { cat <<'EOF' @@ -287,6 +289,7 @@ _PACMAN_detect() { _issue2pacman pkg_tools "Bitrig" && return _issue2pacman apk "Alpine Linux" && return _issue2pacman opkg "OpenWrt" && return + _issue2pacman xbps "Void" && return [ -z "$_PACMAN" ] || return @@ -316,6 +319,7 @@ _PACMAN_detect() { [ -x "/bin/opkg" ] && _PACMAN="opkg" && return [ -x "/usr/bin/tazpkg" ] && _PACMAN="tazpkg" && return [ -x "/usr/bin/swupd" ] && _PACMAN="swupd" && return + [ -x "/bin/xbps-install" ] && _PACMAN="xbps" && return command -v brew >/dev/null && _PACMAN="homebrew" && return @@ -349,6 +353,7 @@ _translate_w() { ;; "apk") local_opt="fetch";; "opkg") local_opt="--download-only";; + "xbps") local_opt="-D";; *) local_opt="" local_ret=1 @@ -392,6 +397,7 @@ _translate_noconfirm() { "pkgng") local_opt="-y";; "tazpkg") local_opt="--auto";; "apk") local_opt="";; + "xbps") local_opt="-y";; *) local_opt="" local_ret=1 @@ -2135,6 +2141,64 @@ tlmgr_U() { +_xbps_init() { + : +} + +xbps_Q() { + xbps-query -l +} + +xbps_Qe() { + xbps-query -m +} + +xbps_Qi() { + xbps-query -s "$@" +} + +xbps_Ql() { + xbps-query -f "$@" +} + +xbps_Qo() { + xbps-query -o "$@" +} + +xbps_Qs() { + xbps-query -s "$@" +} + +xbps_S() { + xbps-install "$@" +} + +xbps_Ss() { + xbps-query -Rs "$@" +} + +xbps_Su() { + xbps-install -u +} + +xbps_Sy() { + xbps-install -S +} + +xbps_Suy() { + xbps-install -Su +} + +xbps_R() { + xbps-remove "$@" +} + +xbps_Scc() { + xbps-remove -O +} + + + _yum_init() { : } @@ -2693,6 +2757,19 @@ _validate_operation() { "tlmgr_Ss") ;; "tlmgr_Suy") ;; "tlmgr_U") ;; + "xbps_Q") ;; + "xbps_Qe") ;; + "xbps_Qi") ;; + "xbps_Ql") ;; + "xbps_Qo") ;; + "xbps_Qs") ;; + "xbps_S") ;; + "xbps_Ss") ;; + "xbps_Su") ;; + "xbps_Sy") ;; + "xbps_Suy") ;; + "xbps_R") ;; + "xbps_Scc") ;; "yum_Q") ;; "yum_Qe") ;; "yum_Qi") ;;