From 67c89d109c88991737c1663bf5204a873acab224 Mon Sep 17 00:00:00 2001 From: ldericher Date: Mon, 24 Aug 2020 19:40:55 +0200 Subject: [PATCH 1/2] Check before install --- kiwi | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kiwi b/kiwi index ae36536..743921f 100755 --- a/kiwi +++ b/kiwi @@ -91,15 +91,20 @@ if [ ! -x "$(kiwi_executable)" ]; then cd "kiwi-config-${KIWI_VERSION}" || : KIWI_VERSION=$(cat "./src/${KIWI_VERSION_TAG}") - # install archive - mkdir -p "$(kiwi_installdir)" - mv "src" "Pipfile" "Pipfile.lock" "$(kiwi_installdir)/" + if [ -x "$(kiwi_executable)" ]; then + # after version update: no need to install + echo "kiwi-config v${KIWI_VERSION} found!" + + else + # install archive + mkdir -p "$(kiwi_installdir)" + mv "src" "Pipfile" "Pipfile.lock" "$(kiwi_installdir)/" + echo "OK" + fi # discard temp dir cd "${WORKDIR}" || : rm -rf "${tmpdir}" - - echo "OK" fi # check virtualenv From d995d931914145c48b78925a9321c8c3d5498ba9 Mon Sep 17 00:00:00 2001 From: ldericher Date: Mon, 24 Aug 2020 19:41:39 +0200 Subject: [PATCH 2/2] bump version tag --- example/kiwi.yml | 2 +- src/etc/version_tag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/kiwi.yml b/example/kiwi.yml index aa29362..9c04e91 100644 --- a/example/kiwi.yml +++ b/example/kiwi.yml @@ -2,7 +2,7 @@ # kiwi-config instance configuration # ###################################### -version: '0.0.2' +version: '0.0.3' runtime: storage: /tmp/kiwi diff --git a/src/etc/version_tag b/src/etc/version_tag index 7bcd0e3..6812f81 100644 --- a/src/etc/version_tag +++ b/src/etc/version_tag @@ -1 +1 @@ -0.0.2 \ No newline at end of file +0.0.3 \ No newline at end of file