Merge tag '0.1.5' into develop

Canary changes
This commit is contained in:
Jörn-Michael Miehe 2020-08-26 15:53:32 +02:00
commit 84a9a001e8
3 changed files with 13 additions and 5 deletions

View file

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

14
kiwi
View file

@ -25,7 +25,7 @@ KIWI_VERSION="master"
KIWI_URI="https://raw.githubusercontent.com/ldericher/kiwi-scp/master/kiwi"
INSTALLER_URI="https://raw.githubusercontent.com/ldericher/kiwi-scp/master/install.sh"
# canary file: limit curl requests
CANARY_FILENAME="/var/lock/kiwi-scp.canary"
CANARY_FILENAME="/tmp/kiwi-scp.canary"
CANARY_MAX_AGE=600
###################
@ -141,6 +141,11 @@ if [ "${run_kiwi_check}" = "yes" ]; then
echo "${installer}" | sh
fi
echo ""
echo "####################"
echo "kiwi self-update finished, please re-run your last command."
exit 0
else
echo "" >/dev/stderr
echo "####################" >/dev/stderr
@ -152,8 +157,11 @@ if [ "${run_kiwi_check}" = "yes" ]; then
fi
fi
# refresh canary
touch "${CANARY_FILENAME}"
# refresh canary file
printf '' > "${CANARY_FILENAME}"
echo "Installed: '${hash_local}'" >> "${CANARY_FILENAME}"
echo "Available: '${hash_remote}'" >> "${CANARY_FILENAME}"
chmod 0777 "${CANARY_FILENAME}"
fi
# check if pwd is a kiwi folder

View file

@ -1 +1 @@
0.1.4
0.1.5