Remove config_parse() because it was causing trouble. Might as well just run pacini every time I want to fetch an option.
This commit is contained in:
parent
70b459b4e7
commit
94ca0038f5
4
PKGBUILD
4
PKGBUILD
|
@ -1,6 +1,6 @@
|
|||
# Maintainer: David Thurstenson <thurstylark@gmail.com>
|
||||
pkgname=tl-makepkg
|
||||
pkgver=0.6
|
||||
pkgver=0.7
|
||||
pkgrel=1
|
||||
pkgdesc="Small utility for running makepkg, then repose to add a local non-AUR package to a custom repo"
|
||||
arch=('any')
|
||||
|
@ -10,7 +10,7 @@ depends=('repose' 'pacutils')
|
|||
backup=('etc/tl-makepkg.conf')
|
||||
source=('tl-makepkg'
|
||||
'tl-makepkg.conf')
|
||||
md5sums=('a241835872805ff68ffc4e0bc687d778'
|
||||
md5sums=('db3a09f25da6e05d53e19b20c1e563ce'
|
||||
'938de8daea15f68500e969df422fd7fa')
|
||||
|
||||
package() {
|
||||
|
|
20
tl-makepkg
20
tl-makepkg
|
@ -2,27 +2,17 @@
|
|||
|
||||
declare -A config
|
||||
|
||||
conf="${CONFIG_FILE:-/etc/tl-makepkg.conf}"
|
||||
|
||||
errmsg() {
|
||||
printf "Error in %s: %s\n" "${FUNCNAME[1]}" "$1" >&2
|
||||
}
|
||||
|
||||
config_parse() { # Usage: config_parse <CONFIG_FILE>
|
||||
if [[ ! -f "$1" ]]; then
|
||||
errmsg "config file '$1' doesn't exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
while IFS== read -r option value <(pacini "$1"); do
|
||||
config["$option"]=$value
|
||||
done
|
||||
}
|
||||
|
||||
makepkg_run() { # Usage: makepkg_run <RepoDir> <MakepkgOpts>
|
||||
PKGDEST="$1"
|
||||
shift 1
|
||||
makepkg "$@"
|
||||
makepkg $@
|
||||
}
|
||||
|
||||
config_parse "${CONFIG_FILE:-/etc/tl-makepkg.conf}"
|
||||
makepkg_run "${config[RepoDir]}" "${config[MakepkgOpts]} $@"
|
||||
repose "${config[ReposeOpts]}" --root "${config[MakepkgOpts]}" --pool "${config[MakepkgOpts]}" "${config[DBFile]}"
|
||||
PKGDEST=$(pacini $conf RepoDir) makepkg $@ $(pacini $conf MakepkgOpts)
|
||||
repose $(pacini $conf ReposeOpts) --root $(pacini $conf RepoDir) --pool $(pacini $conf RepoDir) $(pacini $conf DBFile)
|
||||
|
|
Loading…
Reference in New Issue