Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-06Update local and remote versions at the same timeChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06Rename also in docker filesSKIP_INSTALLChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-01-23Do a full fetchChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-12-22Check for updates on master based on tags not commits (#4475)yubiuser
* 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>
2021-11-26Clean up bash script formattingjbzdarkid
Done with the help of beautysh (a python-based bash formatter) Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
2021-09-12Perform a check of required packages befor updating pihole (#4326)yubiuser
Signed-off-by: Christian König <ckoenig@posteo.de>
2020-02-19thenAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-19force `updatchecker.sh` run if any of the three components are updatedAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-04:dominik: Detect binary name before calling FTLcheckUpdate in update.shAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-15(Squashed commits)Adam Warner
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>
2019-03-02Don't warn if user is on development as this branch is constantly updatedDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-03-02Warn user if FTL is not on branch masterDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-07-20Space/Tab update.shDan Schaper
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-05-02- Test for existence of remote non-master branch of FTL before attemtping to ↵Adam Warner
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>
2018-04-23Some extra code made it's way into the dev branch. Not entirely sure how ↵Adam Warner
that happened... related to #2115 Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-22Merge branch 'development' into Install-Web-ServerDan
2018-04-15Allow passing of --check-only to update script.Adam Warner
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>
2018-04-15install_web_serverDaniel (Fourdee)
+ Splits web interface and server into two variables. + Option to disable forced install of Lighttpd.
2018-04-04Change order of updatable components to match the end outputAdam Warner
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-03move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to ↵Adam Warner
run that first Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-03Fix shellcheck complaintsAdam Warner
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02Break out binary name funtion to it's own functionAdam Warner
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>
2017-07-26Clean up known remaining colour output issues (#1613)WaLLy3K
* 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>
2017-07-02Fix git commands (#1577)DL6ER
2017-07-01Colour Tweaks (#1549)Adam Warner
2017-06-26Integrate DL's update.sh fixes.Dan Schaper
`shellcheck -x` for following files. Do not test for included files SC1091 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-06-21Colourise Core Output Text (#1471)Adam Warner
* 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"
2017-06-15Trim version output when update is successful (#1527)WaLLy3K
2017-06-04Don't update FTL when there is a core update (as this will update FTL a ↵DL6ER
second time). Fixes #1516
2017-04-03Match the Pi-hole brand (#1358)Flo
* 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
2017-03-22Source setupVars before attempting to use itMcat12
Fixes #1347
2017-03-01Merge branch 'development' into new/FTL-binaryDL6ER
2017-02-22update license to EUPL on core filesJacob Salmela
2017-02-22Improved updater logicDL6ER
2017-02-22Updater implementation for FTLDL6ER
2017-02-08Fix indentationMcat12
2017-02-05Merge in `development` branch - resolve conflict in update.shPromofaux
2017-02-05No need to source setupVars, as basic-install.sh is sourced, which sources ↵Promofaux
setupVars itself. Sourception.
2017-02-05commentPromofaux
2017-02-05wrap update logic in admin_installed bool checkPromofaux
2017-02-05source setupVars and only check admin repo if it is enabledPromofaux
2017-02-01Merge pull request #1185 from pi-hole/cleanup/git_functionsMcat12
Move git functions to one script
2017-01-29Use constants for leading paths.Dan Schaper
2017-01-29Path to source basic-install.shDan Schaper
2017-01-29Start moving reused utility functions to one script.Dan Schaper
2017-01-29SpellingDan Schaper
2017-01-29Stay in repo directory until we error checkMcat12
2017-01-05NEW LOGIC FOR THE UPDATERDL6ER
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
2016-12-25Add --quiet to git fetch in GitCheckUpdateAvail()DL6ER
2016-12-25Removed remaining git -CDL6ER