fix depends

This commit is contained in:
éclairevoyant
2023-06-19 09:52:19 -04:00
committed by Fredrick Brennan
parent ba60b304b8
commit ecaca5a84c
5 changed files with 26 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
pkgbase = sensible-utils pkgbase = sensible-utils
pkgdesc = Utilities for sensible alternative selection pkgdesc = Utilities for sensible alternative selection
pkgver = 0.0.20 pkgver = 0.0.20
pkgrel = 2 pkgrel = 3
url = http://packages.debian.org/source/sid/sensible-utils url = http://packages.debian.org/source/sid/sensible-utils
arch = any arch = any
license = GPL license = GPL
@@ -19,12 +19,24 @@ pkgbase = sensible-utils
b2sums = SKIP b2sums = SKIP
pkgname = sensible-browser pkgname = sensible-browser
depends = bash
depends = coreutils
depends = sensible-utils-data
pkgname = sensible-editor pkgname = sensible-editor
depends = bash
depends = coreutils
depends = sensible-utils-data
pkgname = sensible-pager pkgname = sensible-pager
depends = bash
depends = coreutils
depends = sensible-utils-data
pkgname = sensible-terminal pkgname = sensible-terminal
depends = bash
depends = coreutils
depends = sensible-utils-data
pkgname = sensible-utils pkgname = sensible-utils
pkgdesc = Utilities for sensible alternative selection (metapackage) pkgdesc = Utilities for sensible alternative selection (metapackage)
@@ -37,3 +49,4 @@ pkgname = sensible-utils
depends = sensible-utils-data depends = sensible-utils-data
pkgname = sensible-utils-data pkgname = sensible-utils-data
depends = bash

5
.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
/*
!/.gitignore
!/.SRCINFO
!/PKGBUILD
!/sensible-utils*.asc

View File

@@ -1,4 +0,0 @@
6c6
< TESTS = test/ed-as-sensible-editor test/echo-as-browser test/ed-as-visual test/ed-as-fallback test/error-out test/fork-bomb test/shell-script test/failure-propagation test/echo-as-pager
---
> TESTS = test/ed-as-sensible-editor test/echo-as-browser test/ed-as-visual test/ed-as-fallback test/error-out test/shell-script test/failure-propagation test/echo-as-pager

Binary file not shown.

View File

@@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
# Maintainer: Fredrick R. Brennan <copypaste@kittens.ph> # Maintainer: Fredrick R. Brennan <copypaste@kittens.ph>
# Contributor: éclairevoyant
# Contributor: Brian BIdulock <bidulock@openss7.org> # Contributor: Brian BIdulock <bidulock@openss7.org>
pkgbase=sensible-utils pkgbase=sensible-utils
@@ -8,7 +9,7 @@ declare -g -a pkgname=($_pkgname)
pkgname+=(sensible-utils sensible-utils-data) pkgname+=(sensible-utils sensible-utils-data)
pkgver=0.0.20 pkgver=0.0.20
_debianextra='' _debianextra=''
pkgrel=2 pkgrel=3
pkgdesc="Utilities for sensible alternative selection" pkgdesc="Utilities for sensible alternative selection"
arch=('any') arch=('any')
url="http://packages.debian.org/source/sid/sensible-utils" url="http://packages.debian.org/source/sid/sensible-utils"
@@ -50,8 +51,6 @@ check() {
_package_sensible() { _package_sensible() {
cd ${pkgbase}-${pkgver}${_debianextra} cd ${pkgbase}-${pkgver}${_debianextra}
pkgdesc="$pkgdesc (${pkgname##*-})" pkgdesc="$pkgdesc (${pkgname##*-})"
depends+=(sensible-utils-data)
[ "$pkgname" == sensible-utils-data ] && depends=(bash)
export -n EDITOR VISUAL export -n EDITOR VISUAL
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install
shopt -s globstar shopt -s globstar
@@ -60,22 +59,27 @@ _package_sensible() {
} }
package_sensible-pager() { package_sensible-pager() {
depends+=(sensible-utils-data)
CURRENTLY_PACKAGING=sensible-pager pkgdir="$pkgdir" _package_sensible CURRENTLY_PACKAGING=sensible-pager pkgdir="$pkgdir" _package_sensible
} }
package_sensible-browser() { package_sensible-browser() {
depends+=(sensible-utils-data)
CURRENTLY_PACKAGING=sensible-browser pkgdir="$pkgdir" _package_sensible CURRENTLY_PACKAGING=sensible-browser pkgdir="$pkgdir" _package_sensible
} }
package_sensible-editor() { package_sensible-editor() {
depends+=(sensible-utils-data)
CURRENTLY_PACKAGING=editor pkgdir="$pkgdir" _package_sensible CURRENTLY_PACKAGING=editor pkgdir="$pkgdir" _package_sensible
} }
package_sensible-terminal() { package_sensible-terminal() {
depends+=(sensible-utils-data)
CURRENTLY_PACKAGING=terminal pkgdir="$pkgdir" _package_sensible CURRENTLY_PACKAGING=terminal pkgdir="$pkgdir" _package_sensible
} }
package_sensible-utils-data() { package_sensible-utils-data() {
depends=(bash)
CURRENTLY_PACKAGING=gettext pkgdir="$pkgdir" _package_sensible CURRENTLY_PACKAGING=gettext pkgdir="$pkgdir" _package_sensible
} }