[arch-commits] Commit in systemd/trunk (PKGBUILD)
Christian Hesse
eworm at archlinux.org
Thu Jul 26 09:40:31 UTC 2018
Date: Thursday, July 26, 2018 @ 09:40:31
Author: eworm
Revision: 329558
prefix variable names with underscore
Modified:
systemd/trunk/PKGBUILD
----------+
PKGBUILD | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-26 06:22:37 UTC (rev 329557)
+++ PKGBUILD 2018-07-26 09:40:31 UTC (rev 329558)
@@ -76,12 +76,12 @@
# the verified tag is in)
git merge --ff-only "${_commit}"
- local c
- for c in "${_backports[@]}"; do
- git cherry-pick -n "$c"
+ local _c
+ for _c in "${_backports[@]}"; do
+ git cherry-pick -n "${_c}"
done
- for c in "${_reverts[@]}"; do
- git revert -n "$c"
+ for _c in "${_reverts[@]}"; do
+ git revert -n "${_c}"
done
# Replace cdrom/dialout/tape groups with optical/uucp/storage
@@ -89,19 +89,18 @@
}
pkgver() {
- local version count
-
cd "$pkgbase-stable"
- version="$(git describe --abbrev=0 --tags)"
- count="$(git rev-list --count ${version}..)"
- printf '%s.%s' "${version#v}" "${count}"
+ local _version _count
+ _version="$(git describe --abbrev=0 --tags)"
+ _count="$(git rev-list --count ${_version}..)"
+ printf '%s.%s' "${_version#v}" "${_count}"
}
build() {
- local timeservers=({0..3}.arch.pool.ntp.org)
+ local _timeservers=({0..3}.arch.pool.ntp.org)
- local meson_options=(
+ local _meson_options=(
-Daudit=false
-Dgnuefi=true
-Dima=false
@@ -113,13 +112,13 @@
-Ddefault-hierarchy=hybrid
-Ddefault-kill-user-processes=false
-Dfallback-hostname='archlinux'
- -Dntp-servers="${timeservers[*]}"
+ -Dntp-servers="${_timeservers[*]}"
-Drpmmacrosdir=no
-Dsysvinit-path=
-Dsysvrcnd-path=
)
- arch-meson "$pkgbase-stable" build "${meson_options[@]}"
+ arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
ninja -C build
}
More information about the arch-commits
mailing list