1
0
Fork 0
mirror of https://github.com/yavook/kiwi-scp.git synced 2024-11-21 20:33:00 +00:00

canary file location and content; exit after self-update

This commit is contained in:
Jörn-Michael Miehe 2020-08-26 15:52:41 +02:00
parent 363155a79f
commit 36520cecb5
3 changed files with 13 additions and 5 deletions

View file

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

View file

@ -1 +1 @@
0.1.4 0.1.5