mirror of
https://github.com/yavook/kiwi-scp.git
synced 2024-12-25 02:23:01 +00:00
minor bugfixes
This commit is contained in:
parent
936bdbce67
commit
a429777bc3
3 changed files with 8 additions and 8 deletions
|
@ -2,7 +2,7 @@
|
|||
# kiwi-scp instance configuration #
|
||||
###################################
|
||||
|
||||
version: '0.1.3'
|
||||
version: '0.1.4'
|
||||
|
||||
runtime:
|
||||
storage: /tmp/kiwi
|
||||
|
|
12
kiwi
12
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)" "${@}"
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.1.3
|
||||
0.1.4
|
||||
|
|
Loading…
Reference in a new issue