From a429777bc3403a5e384d656ab849906a7bba8446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= Date: Wed, 26 Aug 2020 15:09:17 +0200 Subject: [PATCH] minor bugfixes --- example/kiwi.yml | 2 +- kiwi | 12 ++++++------ src/etc/version_tag | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/example/kiwi.yml b/example/kiwi.yml index 56be52f..5cc7c76 100644 --- a/example/kiwi.yml +++ b/example/kiwi.yml @@ -2,7 +2,7 @@ # kiwi-scp instance configuration # ################################### -version: '0.1.3' +version: '0.1.4' runtime: storage: /tmp/kiwi diff --git a/kiwi b/kiwi index bf9da3c..c122c95 100755 --- a/kiwi +++ b/kiwi @@ -32,6 +32,9 @@ CANARY_MAX_AGE=600 # DYNAMIC STRINGS # ################### +# cache current work directory +WORKDIR="$(pwd)" + # uri of correct kiwi-scp archive kiwi_archive_uri() { echo "${KIWI_REPO}/archive/${KIWI_VERSION}.tar.gz" @@ -52,9 +55,6 @@ kiwi_executable() { echo "$(kiwi_root)/kiwi-scp.py" } -# cache current work directory -WORKDIR="$(pwd)" - ############# # FUNCTIONS # ############# @@ -194,9 +194,6 @@ if [ ! -x "$(kiwi_executable)" ]; then rm -rf "${tmp_dir}" fi -# go back to the original work directory -cd "${WORKDIR}" || : - # setup main environment KIWI_ROOT="$(kiwi_root)" PIPENV_VERBOSITY=-1 @@ -216,5 +213,8 @@ if ! pipenv --venv >/dev/null 2>/dev/null; then echo "OK" fi +# go back to the original work directory +cd "${WORKDIR}" || : + # run main script exec pipenv run "$(kiwi_executable)" "${@}" diff --git a/src/etc/version_tag b/src/etc/version_tag index b1e80bb..845639e 100644 --- a/src/etc/version_tag +++ b/src/etc/version_tag @@ -1 +1 @@ -0.1.3 +0.1.4