diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-11 17:42:58 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-11 22:24:24 +0100 |
| commit | 6ef20dc0d29303c86b5deb134dfeaeb8654eb040 (patch) | |
| tree | 1d99288c422d687cba8c1df267547245654801ae | |
| parent | 98c6e0b94ab1696259da040e571a79fd272d5b4f (diff) | |
| download | kde-6ef20dc0d29303c86b5deb134dfeaeb8654eb040.tar.gz kde-6ef20dc0d29303c86b5deb134dfeaeb8654eb040.tar.bz2 kde-6ef20dc0d29303c86b5deb134dfeaeb8654eb040.zip | |
Documentation: lib.sh: create_keywords_files: Drop base name hack
Requires providing second argument.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rwxr-xr-x | Documentation/maintainers/new/frameworks-bump.sh | 2 | ||||
| -rwxr-xr-x | Documentation/maintainers/new/gear-bump.sh | 2 | ||||
| -rwxr-xr-x | Documentation/maintainers/new/lib.sh | 10 | ||||
| -rwxr-xr-x | Documentation/maintainers/new/plasma-bump.sh | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/maintainers/new/frameworks-bump.sh b/Documentation/maintainers/new/frameworks-bump.sh index 1d51c345f5c..243f46d61e5 100755 --- a/Documentation/maintainers/new/frameworks-bump.sh +++ b/Documentation/maintainers/new/frameworks-bump.sh @@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null bump_set_from_live kde-frameworks ${major_version} mask_from_live_set kde-frameworks ${VERSION} ${kfv} mark_unreleased frameworks ${VERSION} -create_keywords_files ${kfmv} +create_keywords_files ${kfmv} ${set} sed -i -e "/KF_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files Documentation/maintainers/regenerate-files diff --git a/Documentation/maintainers/new/gear-bump.sh b/Documentation/maintainers/new/gear-bump.sh index 853c1927e61..4d4fc7067e2 100755 --- a/Documentation/maintainers/new/gear-bump.sh +++ b/Documentation/maintainers/new/gear-bump.sh @@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null if ! [[ -f sets/kde-gear-${major_version} ]]; then bump_set_from_live kde-gear ${major_version} - create_keywords_files ${kfmv} + create_keywords_files ${kfmv} kde-gear sed -i -e "/GEAR_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files Documentation/maintainers/regenerate-files diff --git a/Documentation/maintainers/new/lib.sh b/Documentation/maintainers/new/lib.sh index d6317e1fa33..59bdcef9836 100755 --- a/Documentation/maintainers/new/lib.sh +++ b/Documentation/maintainers/new/lib.sh @@ -101,16 +101,16 @@ commit_packages() { } # @FUNCTION: create_keywords_files -# @USAGE: <set name> +# @USAGE: <target set> <base setname> # @DESCRIPTION: -# Creates new package.{accept_keywords,unmask,mask}/<set name> files based on -# live dirs and referencing <set name> including any subsets. +# Creates new package.{accept_keywords,unmask,mask}/<target set> files based on +# <base setname>-live dirs and referencing <target setname> including any subsets. create_keywords_files() { local target="${1}" - local base=${target/%-[0-9.]*/} + local base="${2}" local x - if [[ $# -gt 1 ]]; then + if [[ $# -gt 2 ]]; then echo "${FUNCNAME[0]}: error: must be passed exactly one argument!" return fi diff --git a/Documentation/maintainers/new/plasma-bump.sh b/Documentation/maintainers/new/plasma-bump.sh index e567fe87630..978f9cc8570 100755 --- a/Documentation/maintainers/new/plasma-bump.sh +++ b/Documentation/maintainers/new/plasma-bump.sh @@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null if ! [[ -f sets/kde-plasma-${major_version} ]]; then bump_set_from_live kde-plasma ${major_version} # TODO: s/49.9999/50:5/ - create_keywords_files ${kfmv} + create_keywords_files ${kfmv} kde-plasma sed -i -e "/PLASMA_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files Documentation/maintainers/regenerate-files |