jmm/kiwi-scp
2
0
Fork 0
Code Projects Wiki Activity

Merge tag '0.1.4' into develop

Browse source 
Bugfixes; Version 0.1.3 broken.
This commit is contained in:
Jörn-Michael Miehe 2020-08-26 15:09:40 +02:00
commit 363155a79f
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
example/kiwi.yml
View file

@ -2,7 +2,7 @@
# kiwi-scp instance configuration # # kiwi-scp instance configuration #
################################### ###################################
version: '0.1.3' version: '0.1.4'
runtime: runtime:
storage: /tmp/kiwi storage: /tmp/kiwi

12
kiwi
View file

@ -32,6 +32,9 @@ CANARY_MAX_AGE=600
# DYNAMIC STRINGS # # DYNAMIC STRINGS #
################### ###################
# cache current work directory
WORKDIR="$(pwd)"
# uri of correct kiwi-scp archive # uri of correct kiwi-scp archive
kiwi_archive_uri() { kiwi_archive_uri() {
echo "${KIWI_REPO}/archive/${KIWI_VERSION}.tar.gz" echo "${KIWI_REPO}/archive/${KIWI_VERSION}.tar.gz"
@ -52,9 +55,6 @@ kiwi_executable() {
echo "$(kiwi_root)/kiwi-scp.py" echo "$(kiwi_root)/kiwi-scp.py"
} }
# cache current work directory
WORKDIR="$(pwd)"
############# #############
# FUNCTIONS # # FUNCTIONS #
############# #############
@ -194,9 +194,6 @@ if [ ! -x "$(kiwi_executable)" ]; then
rm -rf "${tmp_dir}" rm -rf "${tmp_dir}"
fi fi
# go back to the original work directory
cd "${WORKDIR}" || :
# setup main environment # setup main environment
KIWI_ROOT="$(kiwi_root)" KIWI_ROOT="$(kiwi_root)"
PIPENV_VERBOSITY=-1 PIPENV_VERBOSITY=-1
@ -216,5 +213,8 @@ if ! pipenv --venv >/dev/null 2>/dev/null; then
echo "OK" echo "OK"
fi fi
# go back to the original work directory
cd "${WORKDIR}" || :
# run main script # run main script
exec pipenv run "$(kiwi_executable)" "${@}" exec pipenv run "$(kiwi_executable)" "${@}"

2
src/etc/version_tag
View file

@ -1 +1 @@
0.1.3 0.1.4