pi-hole

Commit Graph

Author	SHA1	Message	Date
DL6ER	401c029dc4	Improve else condition of branch determination Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	0343171703	Add correct displaying for detached HEAD state. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	176fbaf83b	Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Adam Warner	3cc9ba4ee8	stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Adam Warner	6dc85c3527	Don't display branch name if it is on master. Prefer cached remote version over github API Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Adam Warner	851947bbf2	Add branch name to version output Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Mark Drobnak	ed5869646f	Use source instead of dot for setupVars Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	5 years ago
Mcat12	be2d494fcf	Don't show web version in pihole -v output if not installed Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	328e7738d5	Space/Tab version.sh Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
WaLLy3K	30035ce1c2	Merge branch 'development' into tweak/help-output	7 years ago
WaLLy3K	3bd677c102	Show help for "pihole -v -h" * Indent output text * Minor help text change	7 years ago
WaLLy3K	b721ed49ab	Update Help Output (#1467 ) * File consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Standardise core help text * Added help text for disable command * Added help text for logging command * Clean up * Fixed certain new lines and spaces * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Admin help text * Added help text for interface command * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Fixed some wording * Fixed certain spaces * Formatting consistency * Minor wording changes * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Blacklist help text * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Cronometer help text * Formatting consistency * Fixed certain newlines and spaces * Corrected indenting * Checkout warning alteration * Add checkout help text * Corrected help output	7 years ago
WaLLy3K	ea0a9ceb37	Provide remote hashes for version.sh * Provide remote hashes for comparison * Use double braces for all conditions (for consistency) * Suppress potential "cd" error output * Provide "not applicable" output upon any hash request for FTL	7 years ago
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	7 years ago
WaLLy3K	2863308090	Minimise string duplication & other minor changes Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	7 years ago
WaLLy3K	7fef1fdc83	Fixed indentation	7 years ago
WaLLy3K	fe0a35cc7a	Update -h to work as --hash Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093	7 years ago
WaLLy3K	03201e2f20	Display FTL version & version.sh rewrite While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option. I've had the following things in mind while rewriting this: * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0) * I have modified the help text to only output with `pihole -v --help` * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::") Testing output: ``` w3k@MCT:~$ pihole -v Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1) Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1) FTL version is v2.6.2 (Latest: v2.6.2) w3k@MCT:~$ pihole -v -c Current Pi-hole version is v3.0.1-14-ga928cd3 Current Admin Console version is v3.0-9-g3760482 Current FTL version is v2.6.2 w3k@MCT:~$ pihole -v -l Latest Pi-hole version is v3.0.1 Latest Admin Console version is v3.0.1 Latest FTL version is v2.6.2 w3k@MCT:~$ pihole -v -p --hash Current Pi-hole hash is `a928cd3` w3k@MCT:~$ pihole -v -a --hash Current Admin Console hash is 3760482 w3k@MCT:~$ pihole -v --help Usage: pihole -v [REPO \| OPTION] [OPTION] Show Pi-hole, Web Admin & FTL versions <Shows all Repositories and Options> w3k@MCT:~$ pihole -v -foo Invalid Option! ```	7 years ago
DL6ER	38ba079baa	Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface Don't try to obtain version of web interface it it is not installed	7 years ago
Dan Schaper	33f7979359	Merge pull request #1293 from pi-hole/fix/version Account for hash in versioning	7 years ago
DL6ER	6dea00668e	Don't try to obtain version of web interface it it is not installed. Fixes #1303	7 years ago
Dan Schaper	abd3e828de	Optimize normalOutput Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	b85af50d14	Generate only the information that is actually asked for	7 years ago
Dan Schaper	0e8fd49669	Function... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	945e22874e	Collapse duplicate functions, and take out argument loops. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	77ab47a984	Awk for perl Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	ed8088f203	Functions for Core/Web version and hash. And only check first argument in each section. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	8831b22fc8	Prototype function for getting version of local repo Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	0341bd1758	Optimize code, undoc flag for current hash. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	9bb4a5fb25	Factor out variables from display. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	ebfffea5dc	Always show something, even if it's just the short hash of the latest commit. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	81939ab265	Get short hash of local and remote Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	7 years ago
Dan Schaper	fc596e41d4	All scripts set executable	7 years ago
Dan Schaper	925c80edd4	Catch more 1's Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	4b7b859db9	Gotta catch 'em all...'	8 years ago
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.	8 years ago
Marcus Hildum	69ba8a3c2f	Consistency Again trying to move the repo to one style. Doesn't matter if it's changed afterwards, but one style instead of about five seems saner.	8 years ago
Marcus Hildum	0efda04920	Use heredocs instead of multiple calls to echo There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	8 years ago
Marcus Hildum	28eeaf201b	Standardize function declaration There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	8 years ago
Adam Warner	b66f23cfd0	account for new update script	8 years ago
Adam Warner	013d77488a	complete overhaul of version script. Now with optional arguments!	8 years ago
Adam Warner	29ad2496b6	don't output "elevating with sudo" in pihole script, just do it.	8 years ago
Promofaux	e11ef5a7f0	Add version display script. Also checks current version on web and reports version.	8 years ago

44 Commits (4d25f695267590b61a4061f9bb43448005d99b85)