diff --git a/example/kiwi.yml b/example/kiwi.yml index 9c04e91..402216c 100644 --- a/example/kiwi.yml +++ b/example/kiwi.yml @@ -2,7 +2,7 @@ # kiwi-config instance configuration # ###################################### -version: '0.0.3' +version: '0.0.4' runtime: storage: /tmp/kiwi diff --git a/install.sh b/install.sh index 176dcf5..52fdf5e 100755 --- a/install.sh +++ b/install.sh @@ -6,6 +6,8 @@ # dependencies to run kiwi-config KIWI_DEPS="bash python3 pipenv less" +# default install directory +INSTALL_DIR_DEFAULT="/usr/local/bin" ########## # CHECKS # @@ -30,13 +32,12 @@ echo "OK" ######## # prompt for installation directory -install_dir_default="/usr/local/bin" valid="no" while [ "${valid}" = "no" ]; do - printf "Select installation directory [Default: '%s']: " "${install_dir_default}" - read install_dir /dev/null 2>/dev/null; then +if ! curl --proto '=https' --tlsv1.2 -sSf -o "${tmp_file}" "${uri}" >/dev/null 2>/dev/null; then rm "${tmp_file}" echo "Download 'kiwi' failed!" >/dev/stderr exit 1 diff --git a/kiwi b/kiwi index 743921f..4b06067 100755 --- a/kiwi +++ b/kiwi @@ -84,8 +84,7 @@ if [ ! -x "$(kiwi_executable)" ]; then cd "${tmpdir}" || : # download archive - curl --proto '=https' --tlsv1.2 --silent --fail --location --output "kiwi-config.zip" "${KIWI_REPO}/archive/${KIWI_VERSION}.zip" - unzip -qq "kiwi-config.zip" + curl --proto '=https' --tlsv1.2 -sSfL -o "kiwi-config.zip" "${KIWI_REPO}/archive/${KIWI_VERSION}.zip" | tar xz # read archive version tag cd "kiwi-config-${KIWI_VERSION}" || : @@ -121,10 +120,13 @@ cd "${WORKDIR}" || : # setup main environment KIWI_ROOT="$(kiwi_root)" +PIPENV_VERBOSITY=-1 +PIPENV_PIPFILE="$(kiwi_installdir)/Pipfile" export KIWI_ROOT export KIWI_CONF_NAME -export PIPENV_VERBOSITY=-1 +export PIPENV_VERBOSITY +export PIPENV_PIPFILE # run main script exec pipenv run "$(kiwi_executable)" "${@}" diff --git a/src/etc/version_tag b/src/etc/version_tag index 6812f81..05b19b1 100644 --- a/src/etc/version_tag +++ b/src/etc/version_tag @@ -1 +1 @@ -0.0.3 \ No newline at end of file +0.0.4 \ No newline at end of file