Commit Graph

46 Commits

Author SHA1 Message Date
76cb129d3c don't forget master and development branches!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 21:48:09 +00:00
246d5cd587 store checked out FTL branch in /etc/pihole/ftlbranch
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 21:41:00 +00:00
d90489b31d Include branch we're switching from
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 22:21:25 +01:00
f38912a0c9 - Correctly overwrite ${INFO} boxes with ${CROSS} etc
- Notify user that branch has been changed

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 21:33:41 +01:00
247d3ed729 list availible branches for FTL
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 13:54:23 +01:00
031c6428d5 Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/piholeCheckout.sh
2017-07-16 13:34:20 +01:00
f2e9d585f7 * Add helptext for pihole checkout ftl
* Only attempt to install FTL if branch was found
* ~~corebranches~~ webbranches (web branches now actually listed)

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 13:33:00 +01:00
8af9853b9a Fixed minor formatting issues
* Removed useless echo
* Quoted and braced conditionals
* Explicit escaping of newline
* Fixed arrays implicitly concatenating (SC2199)
* Fixed incorrect variable used in checkout web
2017-07-16 22:32:34 +10:00
783f50657b Merge branch 'development' into tweak/checkout_FTL
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/piholeCheckout.sh
2017-07-16 12:25:27 +01:00
bb8a263d70 ShellCheck 2017-07-05 19:34:20 +02:00
70fd94edb3 Edit message when requested branch of FTL is not available 2017-07-05 19:30:05 +02:00
b3eb5c4f0e Colour Tweaks (#1549) 2017-07-01 22:08:17 +10:00
98afb0e998 pihole checkout ftl 2017-06-27 14:28:05 +02:00
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
2516a1e298 Make clear that NO is the default if the user just hits return (#1514) 2017-06-03 17:23:47 +02:00
30035ce1c2 Merge branch 'development' into tweak/help-output 2017-05-14 13:03:33 +10:00
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
2017-05-14 11:11:44 +10:00
db1e5f10ea Make changes according to comment in #1384 2017-04-21 17:08:15 +02:00
2e398c5da4 stash changes on branch switch, else it fails if any changes have been made. 2017-04-14 17:20:13 +01: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
b0ae954f1e Only update when update flag is set to "true"
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-11 12:37:36 -08:00
a2404f104a Just some style and linting. And a cd in fetch_checkout_pull_branch
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-11 12:21:15 -08:00
38547ced7a Can only diff once upstream branch is tracked 2017-03-11 16:55:37 +01:00
9a9d9007cd Add missing "== true" 2017-03-11 16:49:47 +01:00
bd2d81f691 source setupVars.conf to see if INSTALL_WEB is true or not 2017-03-11 16:46:52 +01:00
1b9e7fbf2e Test if branch is locally available is not reliable because of possible ambiguities 2017-03-11 16:40:10 +01:00
d4a49d192f Correct variable name 2017-03-11 16:38:28 +01:00
8cb66544d2 Remove "\ " 2017-03-11 16:36:54 +01:00
140ac192aa The web repo might actually be missing and this is n error (not installed because the user didn't want it) 2017-03-11 16:30:58 +01:00
b961b13d60 Small bugfix 2017-03-11 16:27:00 +01:00
febdb4a190 Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all) 2017-03-11 16:24:13 +01:00
1d60b62e7a Testing alternative way of fetching/checking out of a single branch 2017-03-11 16:11:23 +01:00
41e1e4cb68 Rearrange pull logic, some optimization.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:25:35 -08:00
d5b88e0df8 Get the right name for the options.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:07:58 -08:00
20fd61468d Require branch to check out
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:04:37 -08:00
0a0d25dff4 Script runs in subshell, no need to cd back to pwd.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 10:57:46 -08:00
81a1057cac Fix something Dan has overlooked 2017-03-09 00:30:36 +01:00
fd310c6445 Back to how we had it before, because --unshallow does not work at all 2017-03-09 00:28:02 +01:00
a9b52518bf Shift numbers for argument identifiers, functions are called after shift
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:29:51 -08:00
87da40068c Always exited with value 1, now exits with proper value.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:18:08 -08:00
b8f1eadb7f Shift off checkout from being passed to script from pihole
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:17:56 -08:00
b522d8eaf6 Source and reuse existing variables, centralize code.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:41:11 -08:00
89ff99322d Don't need to remember pwd inside a function, calling function doesn't change directories.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:30:08 -08:00
56e17d1010 Source functions and variables from basic-install.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:28:24 -08:00
d2ab0694b7 Add "master" shortcut 2017-03-08 13:18:34 +01:00
8a14a63d5d Pi-hole checkout feature 2017-03-08 13:16:40 +01:00