From 1f7e4bdd0e95e6cc83bbc17a9afaa29276824325 Mon Sep 17 00:00:00 2001 From: Cameron Miller Date: Mon, 18 Dec 2023 19:48:22 +0000 Subject: [PATCH] add packages --- x86_64/alacritty-cbsh/PKGBUILD | 2 +- x86_64/cbsh-macs/PKGBUILD | 40 ++++++++++++++++++++++++++++ x86_64/cbsh-macs/cbsh-macs.install | 9 +++++++ x86_64/cbsh-session-manager/PKGBUILD | 17 ++---------- x86_64/cbsh-welcome/PKGBUILD | 2 +- x86_64/dmenu-cbsh/PKGBUILD | 2 +- x86_64/dmenu-scripts/PKGBUILD | 2 +- x86_64/doom-cbsh/PKGBUILD | 2 +- x86_64/kitty-cbsh/PKGBUILD | 2 +- x86_64/pikaur/PKGBUILD | 23 +++++++++++----- x86_64/qtile-cbsh/PKGBUILD | 2 +- x86_64/st-cbsh/PKGBUILD | 10 ++++--- x86_64/zsh-cbsh/PKGBUILD | 2 +- 13 files changed, 81 insertions(+), 34 deletions(-) create mode 100644 x86_64/cbsh-macs/PKGBUILD create mode 100644 x86_64/cbsh-macs/cbsh-macs.install diff --git a/x86_64/alacritty-cbsh/PKGBUILD b/x86_64/alacritty-cbsh/PKGBUILD index 0fb77c4..282785b 100644 --- a/x86_64/alacritty-cbsh/PKGBUILD +++ b/x86_64/alacritty-cbsh/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cameron Miller pkgname=alacritty-cbsh _pkgname=cbsh-configs -pkgver=1.0.r33.c3fb929 +pkgver=1.0.r34.4f1f6e9 pkgrel=1 epoch= pkgdesc="The Default Alacritty Config for CBSH." diff --git a/x86_64/cbsh-macs/PKGBUILD b/x86_64/cbsh-macs/PKGBUILD new file mode 100644 index 0000000..0150190 --- /dev/null +++ b/x86_64/cbsh-macs/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Cameron Miller +pkgname=cbsh-macs +_pkgname=cbshmacs-config +pkgver=1.0.r12.a90b95c +pkgrel=1 +epoch= +pkgdesc="CBSHMacs is the New Emacs Configuration for CBSH" +arch=('x86_64') +url="https://gitlab.com/cbsh/cbshmacs-config.git" +license=('GPL3') +groups=() +depends=(emacs) +makedepends=(git) +checkdepends=() +optdepends=() +provides=(cbsh-macs) +conflicts=() +replaces=() +backup=() +options=() +install=${pkgname}.install +changelog= +source=("git+$url") +noextract=() +md5sums=('SKIP') +validpgpkeys=() + +pkgver() { + cd "${_pkgname}" + printf "1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +package() { + cd cbshmacs-config + sudo rm -rf /etc/cbsh/.config/cbsh-macs/ + install -d ${pkgdir}/etc/cbsh/.config/cbsh-macs/ + cp -r ${srcdir}/${_pkgname}/ ${pkgdir}/etc/cbsh/.config/cbsh-macs + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 README.org "${pkgdir}/usr/share/doc/${pkgname}/Readme.org" +} diff --git a/x86_64/cbsh-macs/cbsh-macs.install b/x86_64/cbsh-macs/cbsh-macs.install new file mode 100644 index 0000000..1a50bb1 --- /dev/null +++ b/x86_64/cbsh-macs/cbsh-macs.install @@ -0,0 +1,9 @@ +post_install() { + echo -e "##########################################################" + echo -e "## Config files were placed /etc/cbsh/.config/cbsh-macs ##" + echo -e "##########################################################" +} + +post_upgrade() { + post_install +} diff --git a/x86_64/cbsh-session-manager/PKGBUILD b/x86_64/cbsh-session-manager/PKGBUILD index 369756c..687edb4 100644 --- a/x86_64/cbsh-session-manager/PKGBUILD +++ b/x86_64/cbsh-session-manager/PKGBUILD @@ -1,25 +1,16 @@ # Maintainer: Cameron Miller pkgname=cbsh-session-manager _pkgname=cbsh-session-manager -pkgver=1.0.r9.5bd8cb0 +pkgver=1.0.r18.342edb5 pkgrel=1 epoch= -<<<<<<< HEAD -pkgdesc="A Basic Session Manager Specific for CBSH" -======= pkgdesc="A Simple Session manager for CBSH" ->>>>>>> 933c2e5 (Add cbsh-welcome to repos) arch=('x86_64') url="https://www.gitlab.com/cbsh/cbsh-session-manager.git" license=('GPL3') groups=() -<<<<<<< HEAD -depends=(python-gobject gtk3) -makedepends=(git) -======= -depends=() +depends=(python-gobject python-tomlkit gtk3) makedepends=(git python-build python-installer python-wheel) ->>>>>>> 933c2e5 (Add cbsh-welcome to repos) checkdepends=() optdepends=() provides=(cbsh-session-manager) @@ -44,11 +35,7 @@ build() { } package() { -<<<<<<< HEAD - cd cbsh-session-manager -======= cd "${_pkgname}" ->>>>>>> 933c2e5 (Add cbsh-welcome to repos) python -m installer --destdir="$pkgdir" dist/*.whl install -Dm775 cbsh-session-manager "${pkgdir}/usr/local/bin/cbsh-session-manager" diff --git a/x86_64/cbsh-welcome/PKGBUILD b/x86_64/cbsh-welcome/PKGBUILD index 4682f5f..81e61ff 100644 --- a/x86_64/cbsh-welcome/PKGBUILD +++ b/x86_64/cbsh-welcome/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cameron Miller pkgname=cbsh-welcome _pkgname=cbsh-welcome -pkgver=1.0 +pkgver=1.0.r20.bc269f4 pkgrel=1 epoch= pkgdesc="The Welcome App and Tweaker for CBSH" diff --git a/x86_64/dmenu-cbsh/PKGBUILD b/x86_64/dmenu-cbsh/PKGBUILD index 2e72e29..0540f16 100644 --- a/x86_64/dmenu-cbsh/PKGBUILD +++ b/x86_64/dmenu-cbsh/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Cameron Miller pkgname=dmenu-cbsh -pkgver=5.0.r29.da1c4a9 +pkgver=5.0.r32.62cb8f7 pkgrel=1 pkgdesc="A Custom build of dmenu patched for centering, borders, custom line height and more colours" arch=(x86_64) diff --git a/x86_64/dmenu-scripts/PKGBUILD b/x86_64/dmenu-scripts/PKGBUILD index 18ad11b..32480df 100644 --- a/x86_64/dmenu-scripts/PKGBUILD +++ b/x86_64/dmenu-scripts/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Cameron Miller pkgname=dmenu-scripts -pkgver=1.0.r29.da1c4a9 +pkgver=1.0.r32.62cb8f7 pkgrel=1 pkgdesc="Some basic dmenu Scripts to make things a bit easier in life." arch=('any') diff --git a/x86_64/doom-cbsh/PKGBUILD b/x86_64/doom-cbsh/PKGBUILD index 4222460..a448b3b 100644 --- a/x86_64/doom-cbsh/PKGBUILD +++ b/x86_64/doom-cbsh/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cameron Miller pkgname=doom-cbsh _pkgname=cbsh-configs -pkgver=1.0.r33.c3fb929 +pkgver=1.0.r34.4f1f6e9 pkgrel=1 epoch= pkgdesc="The Default Doom Emacs Config for CBSH." diff --git a/x86_64/kitty-cbsh/PKGBUILD b/x86_64/kitty-cbsh/PKGBUILD index 1ed9c2a..3799b1c 100644 --- a/x86_64/kitty-cbsh/PKGBUILD +++ b/x86_64/kitty-cbsh/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cameron Miller pkgname=kitty-cbsh _pkgname=cbsh-configs -pkgver=1.0.r33.c3fb929 +pkgver=1.0.r34.4f1f6e9 pkgrel=1 epoch= pkgdesc="The Default Kitty Config for CBSH." diff --git a/x86_64/pikaur/PKGBUILD b/x86_64/pikaur/PKGBUILD index ce0d31a..0928801 100644 --- a/x86_64/pikaur/PKGBUILD +++ b/x86_64/pikaur/PKGBUILD @@ -2,7 +2,7 @@ # shellcheck disable=SC2034,SC2154 pkgname=pikaur-git -pkgver=1.10.1.r45.gc48c41b +pkgver=1.18.3.r15.g163aa82 pkgrel=1 pkgdesc="AUR helper which asks all questions before installing/building. Inspired by pacaur, yaourt and yay." arch=('any') @@ -11,7 +11,7 @@ license=('GPL3') source=( "$pkgname::git+https://github.com/actionless/pikaur.git#branch=master" ) -md5sums=( +b2sums=( "SKIP" ) depends=( @@ -19,11 +19,17 @@ depends=( 'git' ) makedepends=( - 'python-commonmark' + 'python-wheel' + 'python-hatchling' + 'python-build' + 'python-installer' + 'python-setuptools' # i think it normally should be required by python-pep517 which required by python-build/installer + 'python-markdown-it-py' ) optdepends=( - 'asp: for ABS support in -G/--getpkgbuild operation' + 'devtools: for Arch Pkgs support in -G/--getpkgbuild operation' 'python-pysocks: for socks5 proxy support' + 'python-defusedxml: securely wrap Arch news replies' ) conflicts=('pikaur') provides=('pikaur') @@ -36,13 +42,17 @@ pkgver() { build() { cd "${srcdir}/${pkgname}" || exit 2 - sed -i -e "s/VERSION.*=.*/VERSION = '${pkgver}'/g" pikaur/config.py + sed -i -e "s/^VERSION.*=.*/VERSION = '${pkgver}'/g" pikaur/config.py + if test -d ./dist ; then + rm -r ./dist + fi make + /usr/bin/python3 -m build --wheel --no-isolation } package() { cd "${srcdir}/${pkgname}" || exit 2 - /usr/bin/python3 setup.py install --prefix=/usr --root="$pkgdir/" --optimize=1 + /usr/bin/python3 -m installer --destdir="$pkgdir" dist/*.whl for langmo in $(cd ./locale && ls ./*.mo); do lang=$(sed -e 's/.mo$//' <<< "${langmo}") install -Dm644 "locale/${langmo}" "$pkgdir/usr/share/locale/${lang}/LC_MESSAGES/pikaur.mo" @@ -50,5 +60,4 @@ package() { install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 pikaur.1 "$pkgdir/usr/share/man/man1/pikaur.1" cp -r ./packaging/* "${pkgdir}" - cp -r ./dist/* "${pkgdir}" } diff --git a/x86_64/qtile-cbsh/PKGBUILD b/x86_64/qtile-cbsh/PKGBUILD index 371c786..64ed111 100644 --- a/x86_64/qtile-cbsh/PKGBUILD +++ b/x86_64/qtile-cbsh/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cameron Miller pkgname=qtile-cbsh _pkgname=cbsh-configs -pkgver=1.0.r33.c3fb929 +pkgver=1.0.r34.4f1f6e9 pkgrel=1 epoch= pkgdesc="The Default Qtile Config for CBSH." diff --git a/x86_64/st-cbsh/PKGBUILD b/x86_64/st-cbsh/PKGBUILD index bf900f3..77c1238 100644 --- a/x86_64/st-cbsh/PKGBUILD +++ b/x86_64/st-cbsh/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Cameron Miller pkgname=st-cbsh -pkgver=5.0.r29.da1c4a9 +pkgver=5.0.r32.62cb8f7 pkgrel=1 pkgdesc="A Custom build of st patched with a few nice to have's" arch=(x86_64) @@ -33,10 +33,12 @@ build() { } package() { - cd st-cbsh - mkdir -p ${pkgdir}/opt/${pkgname} + cd st-cbsh + mkdir -p ${pkgdir}/opt/${pkgname} cp -rf * ${pkgdir}/opt/${pkgname} - make PREFIX=/usr DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 README.org "${pkgdir}/usr/share/doc/${pkgname}/README.org" + make PREFIX=/usr DESTDIR="${pkgdir}" install + + } diff --git a/x86_64/zsh-cbsh/PKGBUILD b/x86_64/zsh-cbsh/PKGBUILD index 79d713e..0e918cf 100644 --- a/x86_64/zsh-cbsh/PKGBUILD +++ b/x86_64/zsh-cbsh/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cameron Miller pkgname=zsh-cbsh _pkgname=cbsh-configs -pkgver=1.0.r33.c3fb929 +pkgver=1.0.r34.4f1f6e9 pkgrel=1 epoch= pkgdesc="The Default Zsh Config for CBSH."