40 commits

Author	SHA1	Message	Date
Adam Warner	f193edd428	Merge branch 'development' into development-v6-merge-development (resolved conflicts) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2024-02-09 19:22:53 +00:00
DL6ER	47f06dfd71	Do not store remote version in versions file if on custom branch. It's always wrong here ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2024-01-15 20:53:34 +01:00
Christian König	ced1c5d50b	Start counting at postion 1 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-11-01 21:57:36 +01:00
Adam Warner	71357ecae7	adminlte->web ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-10-08 14:12:02 +01:00
Adam Warner	7886dc0172	adminlte->web ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-10-08 14:09:47 +01:00
Adam Warner	0e8f285f4f	Always assume that the web interface will be installed. ... We could revist this again in future if we decide that there should still be a choice to install the interface or not Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-05-27 11:51:16 +01:00
Adam Warner	38775cffdf	Ensure local hash is always of length 8, for consistency. ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-11-14 22:51:39 +00:00
Adam Warner	ba74051502	Grab local FTL hash correctly from FTL's own version output, and grab one digit less for remote hashes (also in debug log) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-11-14 22:09:26 +00:00
Adam Warner	cdbe4c9b86	Get only the precise tag number when getting local version, do not show branch name when on master branch(es) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-11-14 20:39:34 +00:00
Christian König	c84be5de61	Reorganize by component rather then source ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-14 13:18:12 +02:00
Christian König	d7f7ef9965	Only create VERSION_FILE if it does not exist ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 14:37:56 +02:00
Christian König	888e44e53d	Add hash functions to updatecheck ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 14:34:34 +02:00
Christian König	18d28533eb	Update local and remote versions at the same time ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 12:36:17 +02:00
Christian König	56527e5dd9	Add get_remote_version() to updatechecker ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 12:03:12 +02:00
Adam Warner	9debd22179	If, after reading /pihole.docker.tag into DOCKER_TAG, it does not match an expected pattern, unset it - this should prevent arbitary code from being run ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-25 15:51:09 +01:00
Adam Warner	b6d1bd7335	Read docker tag from file in root, not the previously set environment variable ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-19 22:01:05 +01:00
Adam Warner	3d53bda121	Update advanced/Scripts/updatecheck.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de> Signed-off-by: Adam Warner <github@adamwarner.co.uk>	2022-09-15 17:54:54 +01:00
Adam Warner	bf256aa5a7	If docker version env var is set, store it in /etc/pihole/versions file for later use ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-14 22:38:41 +01:00
Christian König	49b9dc8888	Remove json_extract function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-25 09:55:47 +02:00
Adam Warner	a4b899c256	Review suggestions (and shellcheck complaints) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-23 19:10:12 +01:00
Adam Warner	5421aad03e	Store versions as key/value pairs rather than space delimeted values ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-22 19:11:27 +01:00
Dan Schaper	7de6bbca61	Merge branch 'development' into release/v4.3	2019-05-18 13:18:14 -07:00
mpiederiet	3220e2b978	Fix for preventing git error message in cron logs ... Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-11 10:57:44 +02:00
pvogt09	8a92fb24c4	Incorporates changes requested by @Mcat12 ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-01 11:20:26 +02:00
pvogt09	5c575e73c7	Adds world readable attribute to files created by Pi-hole to circumvent #2724 ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-04-30 22:41:12 +02:00
Mark Drobnak	85dceb12a1	Use curl -s instead of -q ... See #2416 Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2018-10-12 23:53:21 -04:00
Mcat12	d55012f724	Append versions (after the first) instead of overwriting in updatecheck ... Fixes an issue brought up in #2435 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 20:56:44 -04:00
Adam Warner	0627e68078	Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 19:45:04 +01:00
Adam Warner	7d78f6314a	Source Setupvars file and only check local/remote Web branch/version if the web interface is installed. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 19:41:04 +01:00
Dan Schaper	aca359c2e2	Space/Tab updatecheck.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:24:05 -07:00
DL6ER	cca8412921	Use "echo -n" to avoid haveing newlines in the files ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-23 11:52:27 +01:00
DL6ER	d15a5ad5c1	Add required documentation in the source code ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-23 00:46:51 +01:00
DL6ER	8ed75dd176	Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-23 00:42:41 +01:00
DL6ER	be0c457445	Sleep 30 seconds after reboot to be sure that the system is ready ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-21 12:42:28 +01:00
DL6ER	05d015169c	Check for local version and branches every 10 minutes, check for remote versions only once a day ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-09 19:00:46 +01:00
DL6ER	90efa3b610	Simplify git subroutines ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-08 19:11:41 +01:00
DL6ER	0db76aada0	Silence errors when directory to be checked does not exist (system may have been installed without a web interface!) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-28 15:44:17 +02:00
DL6ER	9be854031f	Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-28 13:41:24 +02:00
DL6ER	709851503f	Use "pihole-FTL branch" to get FTL's branch ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-28 13:27:12 +02:00
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	2017-10-28 13:20:02 +02:00