Age | Commit message (Collapse) | Author |
|
Signed-off-by: Christian König <ckoenig@posteo.de>
|
|
Signed-off-by: Christian König <ckoenig@posteo.de>
|
|
Signed-off-by: Christian König <ckoenig@posteo.de>
|
|
* Check for updates on master based on tags not commits
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix stickler
Signed-off-by: Christian König <ckoenig@posteo.de>
* Address reviewer's comments
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix stickler again
Signed-off-by: Christian König <ckoenig@posteo.de>
* Use local git instead of relying on github
Signed-off-by: Christian König <ckoenig@posteo.de>
* Add --tags
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
|
|
Done with the help of beautysh (a python-based bash formatter)
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
|
|
Signed-off-by: Christian König <ckoenig@posteo.de>
|
|
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
|
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
|
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
|
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
no need for global variable
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Use a file in the temporary FTL download directory
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Local binary variable named to l_binary. Disambiguate from global binary.
Allow 'binary' to be shadowed for testing.
Use ./ftlbinary in all operations.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Revert shadow ability on binary variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Remove unused tests, binary variable can not be overridden.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This should work here, too
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
binary name is passed through from pihole checkout
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Add comments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
OK, let's try it this way again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
we might be getting somewhere.. squash after this I think!
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
fix the rest of the tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Remove trailing whitespace in the files we've touched here
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
|
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
|
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
|
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
|
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>
|
|
that happened... related to #2115
Signed-off-by: Adam Warner <adamw@rner.email>
|
|
|
|
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>
|
|
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
|
|
Signed-off-by: Adam Warner <adamw@rner.email>
|
|
run that first
Signed-off-by: Adam Warner <adamw@rner.email>
|
|
Signed-off-by: Adam Warner <adamw@rner.email>
|
|
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>
|
|
* 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>
|
|
|
|
|
|
`shellcheck -x` for following files.
Do not test for included files SC1091
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
|
* 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"
|
|
|
|
second time). Fixes #1516
|
|
* 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
|
|
Fixes #1347
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setupVars itself. Sourception.
|
|
|
|
|
|
|
|
Move git functions to one script
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|