From f455c85500a947bd752fbc79b1129bae4bcdd5f32cb0fa71e3946792a951ee44 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 27 Aug 2020 07:14:20 +0000 Subject: [PATCH] - Fix grammar, update README and .service. Technically the name should be changed as well, but that's just cosmetic. OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_metainfo_helper?expand=0&rev=12 --- README | 3 ++- kiwi_metainfo_helper | 4 ++-- kiwi_metainfo_helper.service | 4 ++-- obs-service-kiwi_metainfo_helper.changes | 6 ++++++ obs-service-kiwi_metainfo_helper.spec | 4 ++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README b/README index 79696dd..fc92660 100644 --- a/README +++ b/README @@ -2,7 +2,8 @@ obs-service-kiwi_metainfo_helper ================================ This service can be enabled to run during buildtime, when it will edit the -kiwi image description to replace placeholders with build-specific metainfo. +build recipe (.kiwi, Dockerfile, Chart.yaml) to replace placeholders with +build-specific metainfo. | Placeholder | Value | Example | |--------------------|--------------------------------------------|-----------------------------------------------------------------------------------------------| diff --git a/kiwi_metainfo_helper b/kiwi_metainfo_helper index 8defc43..e519dd1 100644 --- a/kiwi_metainfo_helper +++ b/kiwi_metainfo_helper @@ -15,7 +15,7 @@ if [ -e "${BUILD_DATA}" ]; then RECIPEFILE="${RECIPEFILE##*:}" if [ "${RECIPEFILE##*.}" != "kiwi" ] && [ "${RECIPEFILE}" != "Dockerfile" ] && [ "${RECIPEFILE}" != "Chart.yaml" ]; then - echo "Recipe is neither Dockerfile nor kiwi nor helm chart - exiting" + echo "Recipe is neither Dockerfile, kiwi recipe nor helm chart - exiting" exit 0 fi @@ -28,7 +28,7 @@ else # Guess the build recipe files=(*.kiwi Dockerfile* Chart.yaml*) if [ "${#files}" -eq 0 ]; then - echo "No kiwi or Dockerfile or helm chart found - exiting" + echo "No kiwi recipe, Dockerfile or helm chart found - exiting" exit 0 fi fi diff --git a/kiwi_metainfo_helper.service b/kiwi_metainfo_helper.service index a9a48d4..81c4d96 100644 --- a/kiwi_metainfo_helper.service +++ b/kiwi_metainfo_helper.service @@ -1,4 +1,4 @@ - Substitute various variables in .kiwi files - Substitutes %DISTURL%, %RELEASE% and %BUILDTIME% in .kiwi files. + Substitute various variables in build recipes + Substitutes %DISTURL%, %RELEASE% and %BUILDTIME% in build recipes. diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes index c4e964c..f15138b 100644 --- a/obs-service-kiwi_metainfo_helper.changes +++ b/obs-service-kiwi_metainfo_helper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 27 07:12:48 UTC 2020 - Fabian Vogt + +- Fix grammar, update README and .service. Technically the name + should be changed as well, but that's just cosmetic. + ------------------------------------------------------------------- Tue Aug 25 11:10:50 UTC 2020 - Stefan Nica diff --git a/obs-service-kiwi_metainfo_helper.spec b/obs-service-kiwi_metainfo_helper.spec index 92dbf02..b2317d7 100644 --- a/obs-service-kiwi_metainfo_helper.spec +++ b/obs-service-kiwi_metainfo_helper.spec @@ -19,7 +19,7 @@ Name: obs-service-kiwi_metainfo_helper Version: 0.0 Release: 0 -Summary: Service for substituting various variables in kiwi recipes +Summary: Service for substituting various variables in build recipes License: GPL-2.0-or-later Group: Development/Tools/Building URL: https://build.opensuse.org @@ -37,7 +37,7 @@ BuildArch: noarch %description This service can be used during buildtime to gain access to various variables -in kiwi recipes. +in build recipes. %prep %setup -q -D -T -n .