pi-hole

Commit Graph

Author	SHA1	Message	Date
Adam Warner	545b6605bc	4.3.3 (#3154 ) * Backport `ee7090b8fc` to v4 to prevent failures in FTL download * update tests to reflect changes to FTL download URL * backport `tbd` fix Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
DL6ER	2e17c23333	Don't warn if user is on development as this branch is constantly updated Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	63f3381a2b	Warn user if FTL is not on branch master Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Dan Schaper	1cd40dc9e5	Space/Tab update.sh Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Adam Warner	a6e4b0fea5	- Test for existence of remote non-master branch of FTL before attemtping to check for update - Move some functions from checkout to basic-install - provide helpful error message on downlaod not existing Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	ceaf4bc6bc	Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Dan	acfc49fd41	Merge branch 'development' into Install-Web-Server	6 years ago
Adam Warner	bca23dd896	Allow passing of --check-only to update script. Don't run installer for updating web files, it's handled by getGitFiles. I think this works... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Daniel (Fourdee)	3a483a1b20	install_web_server + Splits web interface and server into two variables. + Option to disable forced install of Lighttpd.	6 years ago
Adam Warner	631f5b4848	Change order of updatable components to match the end output Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	f37b2bc7c1	move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	56278c6394	Fix shellcheck complaints Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	b1d6c03190	Break out binary name funtion to it's own function Remove duplicate code. get_binary_name is now in the install script Add some "version" checking to ftl download when using an alt branch, uses checksum Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh Always run install script to finalise changes. Install script now outputs versions after an update (This is a Squash of previous work into one commit) Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613 ) * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
DL6ER	6ce79ae1d0	Fix git commands (#1577 )	7 years ago
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549 )	7 years ago
Dan Schaper	c29c4ceb0f	Integrate DL's update.sh fixes. `shellcheck -x` for following files. Do not test for included files SC1091 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Adam Warner	536585b846	Colourise Core Output Text (#1471 ) * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	7 years ago
WaLLy3K	aff5ff08d5	Trim version output when update is successful (#1527 )	7 years ago
DL6ER	f1146a3443	Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516	7 years ago
Flo	7e0aa822b6	Match the Pi-hole brand (#1358 ) * Update README.md * Update index.php * Update basic-install.sh * Update piholeCheckout.sh * Update update.sh * Update CONTRIBUTING.md * Update the Pi-hole brand tip in CONTRIBUTING.md Use a better formulation. * Update README.md 2	7 years ago
Mcat12	fb3e6ee35c	Source setupVars before attempting to use it Fixes #1347	7 years ago
DL6ER	66b7d04b82	Merge branch 'development' into new/FTL-binary	7 years ago
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	7 years ago
DL6ER	078cc7660e	Improved updater logic	7 years ago
DL6ER	af2893d2ce	Updater implementation for FTL	7 years ago
Mcat12	a48317883d	Fix indentation	7 years ago
Promofaux	4fcf8fd23f	Merge in `development` branch - resolve conflict in update.sh	7 years ago
Promofaux	10a30344e5	No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.	7 years ago
Promofaux	b764d17c64	comment	7 years ago
Promofaux	ba0abdb88d	wrap update logic in admin_installed bool check	7 years ago
Promofaux	1428b58dde	source setupVars and only check admin repo if it is enabled	7 years ago
Mcat12	18eb8a2159	Merge pull request #1185 from pi-hole/cleanup/git_functions Move git functions to one script	7 years ago
Dan Schaper	3d9d13222b	Use constants for leading paths.	7 years ago
Dan Schaper	745adabb05	Path to source basic-install.sh	7 years ago
Dan Schaper	3861b57dc6	Start moving reused utility functions to one script.	7 years ago
Dan Schaper	99a4a80017	Spelling	7 years ago
Mcat12	033ba26041	Stay in repo directory until we error check	7 years ago
DL6ER	e3c1fcd2c6	NEW LOGIC FOR THE UPDATER Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user	7 years ago
DL6ER	e15548cbf5	Add --quiet to git fetch in GitCheckUpdateAvail()	7 years ago
DL6ER	5e28e6b9ac	Removed remaining git -C	7 years ago
Dan Schaper	3365ef7aaa	`is_repo()` returns values to caller, silence function. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	68c17b26dc	Bashisms Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	e647efd471	Shell script, not javascript Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	15db1ffdd5	Remove variables not needed any more	7 years ago
DL6ER	4632b0f797	Updated updater logic	7 years ago
DL6ER	65c35a5530	Use new subroutine to determine if updates are available	7 years ago
DL6ER	c449a1c0e0	Added GitCheckUpdateAvail()	7 years ago
DL6ER	b020010f0d	Removed some of the &> /dev/null	7 years ago
DL6ER	0276c72fe2	replace 'git -C' with long version (see #1009 )	7 years ago

1 2

98 Commits (545b6605bc03dacc31e3f96d20beea5065c50bfe)