mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 02:16:18 +02:00
Compare commits
1 Commits
2b2d224776
...
272-check-
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8125a81a98 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
|||||||
db
|
db
|
||||||
diff
|
diff
|
||||||
issue
|
issue
|
||||||
license
|
|
||||||
release
|
release
|
||||||
repo
|
repo
|
||||||
search
|
search
|
||||||
|
@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
|
|||||||
makechrootpkg_args+=("${@:$OPTIND}")
|
makechrootpkg_args+=("${@:$OPTIND}")
|
||||||
|
|
||||||
# Automatically recreate the root chroot if a version mismatch is detected
|
# Automatically recreate the root chroot if a version mismatch is detected
|
||||||
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
|
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
|
||||||
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
|
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
|
||||||
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
||||||
clean_first=true
|
clean_first=true
|
||||||
|
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
|
|||||||
if [[ ! -f "${file}" ]]; then
|
if [[ ! -f "${file}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if ! git ls-files --error-unmatch "$file" >/dev/null; then
|
if ! git ls-files --error-unmatch "$file"; then
|
||||||
die "%s is not under version control" "$file"
|
die "%s is not under version control" "$file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@@ -188,13 +188,10 @@ path = [
|
|||||||
"README.md",
|
"README.md",
|
||||||
"keys/**",
|
"keys/**",
|
||||||
".SRCINFO",
|
".SRCINFO",
|
||||||
".gitignore",
|
|
||||||
".nvchecker.toml",
|
".nvchecker.toml",
|
||||||
"*.install",
|
"*.install",
|
||||||
"*.sysusers",
|
"*.sysusers",
|
||||||
"*sysusers.conf",
|
|
||||||
"*.tmpfiles",
|
"*.tmpfiles",
|
||||||
"*tmpfiles.conf",
|
|
||||||
"*.logrotate",
|
"*.logrotate",
|
||||||
"*.pam",
|
"*.pam",
|
||||||
"*.service",
|
"*.service",
|
||||||
|
@@ -14,11 +14,6 @@ source /usr/share/makepkg/util/schema.sh
|
|||||||
|
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
# escapes regex metacharacters in a given string
|
|
||||||
_escape_pkgver() {
|
|
||||||
# shellcheck disable=SC2001
|
|
||||||
sed 's:[\^.\[$()|*+?{\\]:\\&:g' <<<"$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
# set the pkgver variable in a PKGBUILD
|
# set the pkgver variable in a PKGBUILD
|
||||||
# assumes that the pkgbuild is sourced to detect the presence of a pkgver function
|
# assumes that the pkgbuild is sourced to detect the presence of a pkgver function
|
||||||
@@ -26,8 +21,6 @@ pkgbuild_set_pkgver() {
|
|||||||
local new_pkgver=$1
|
local new_pkgver=$1
|
||||||
local pkgver=${pkgver}
|
local pkgver=${pkgver}
|
||||||
|
|
||||||
pkgver="$(_escape_pkgver "${pkgver}")"
|
|
||||||
|
|
||||||
if [[ $(type -t pkgver) == function ]]; then
|
if [[ $(type -t pkgver) == function ]]; then
|
||||||
# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
|
# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
|
||||||
warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
|
warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
|
||||||
|
Reference in New Issue
Block a user