Commit Graph

85 Commits

Author SHA1 Message Date
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>
2017-07-26 18:00:08 +01:00
DL6ER 6ce79ae1d0 Fix git commands (#1577) 2017-07-01 23:52:10 +02:00
Adam Warner b3eb5c4f0e Colour Tweaks (#1549) 2017-07-01 22:08:17 +10:00
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>
2017-06-25 14:39:09 -07:00
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"
2017-06-21 21:49:05 +10:00
WaLLy3K aff5ff08d5 Trim version output when update is successful (#1527) 2017-06-15 09:50:05 +02:00
DL6ER f1146a3443
Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516 2017-06-04 12:41:44 +02:00
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
2017-04-03 17:29:57 +02:00
Mcat12 fb3e6ee35c Source setupVars before attempting to use it
Fixes #1347
2017-03-21 18:01:51 -04:00
DL6ER 66b7d04b82
Merge branch 'development' into new/FTL-binary 2017-03-01 12:42:48 +01:00
Jacob Salmela 7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
DL6ER 078cc7660e
Improved updater logic 2017-02-22 11:00:45 +01:00
DL6ER af2893d2ce
Updater implementation for FTL 2017-02-22 10:43:13 +01:00
Mcat12 a48317883d Fix indentation 2017-02-07 18:14:41 -05:00
Promofaux 4fcf8fd23f Merge in `development` branch - resolve conflict in update.sh 2017-02-05 19:39:02 +00:00
Promofaux 10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception. 2017-02-05 19:29:56 +00:00
Promofaux b764d17c64 comment 2017-02-05 19:18:27 +00:00
Promofaux ba0abdb88d wrap update logic in admin_installed bool check 2017-02-05 19:12:09 +00:00
Promofaux 1428b58dde source setupVars and only check admin repo if it is enabled 2017-02-05 19:07:04 +00:00
Mcat12 18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions
Move git functions to one script
2017-01-31 19:05:53 -05:00
Dan Schaper 3d9d13222b
Use constants for leading paths. 2017-01-28 17:42:55 -08:00
Dan Schaper 745adabb05
Path to source basic-install.sh 2017-01-28 17:38:14 -08:00
Dan Schaper 3861b57dc6
Start moving reused utility functions to one script. 2017-01-28 17:32:42 -08:00
Dan Schaper 99a4a80017
Spelling 2017-01-28 17:08:38 -08:00
Mcat12 033ba26041 Stay in repo directory until we error check 2017-01-28 20:00:02 -05:00
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
2017-01-05 13:10:19 +01:00
DL6ER e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail() 2016-12-25 01:18:58 +01:00
DL6ER 5e28e6b9ac
Removed remaining git -C 2016-12-25 01:17:46 +01:00
Dan Schaper 3365ef7aaa
`is_repo()` returns values to caller, silence function.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
Dan Schaper 68c17b26dc
Bashisms
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
Dan Schaper e647efd471
Shell script, not javascript
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
DL6ER 15db1ffdd5
Remove variables not needed any more 2016-12-24 15:48:43 +01:00
DL6ER 4632b0f797
Updated updater logic 2016-12-24 15:40:31 +01:00
DL6ER 65c35a5530
Use new subroutine to determine if updates are available 2016-12-24 15:32:25 +01:00
DL6ER c449a1c0e0
Added GitCheckUpdateAvail() 2016-12-24 15:19:39 +01:00
DL6ER b020010f0d
Removed some of the &> /dev/null 2016-12-24 15:08:30 +01:00
DL6ER 0276c72fe2
replace 'git -C' with long version (see #1009) 2016-12-24 15:05:57 +01:00
Promofaux 2f976504e8 switch out -eq for == 2016-11-02 20:06:21 +00:00
Dan Schaper f7d0de53bb Compare string to string. 2016-11-02 12:11:34 -07:00
Dan Schaper 603ec997ba Remove testing block. 2016-11-02 12:09:33 -07:00
Dan Schaper f7266ef4c8 Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user. 2016-11-02 12:07:59 -07:00
Dan Schaper 3d43e1568c Use explicit calls for function to self-document 2016-11-02 11:39:22 -07:00
Dan Schaper c1a3f003e8 Rename the only utilty function left that didn't say `repo` 2016-11-02 11:18:13 -07:00
Dan Schaper 3f61aea7fc Utility functions fully quiet now. Calling functions have the echos. 2016-11-02 11:09:53 -07:00
Dan Schaper bd68db51e0 ShellCheck split local declaration and assignment. 2016-11-02 11:01:50 -07:00
Dan Schaper b8a5ed710e Take echos out of utility functions and move up a level. 2016-11-02 10:51:09 -07:00
Dan Schaper 34be601dd7 Test for lexicographically less than tag version. 2016-11-02 10:42:05 -07:00
Dan Schaper 1d64ad1ccd Stash all changed files, clean directory and pull updates. 2016-11-02 10:39:27 -07:00
Dan Schaper f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 2016-11-02 09:48:00 -07:00
Adam Warner ee37c37cab fix update output logic. version number variables should not be read only! 2016-11-02 14:29:20 +00:00