WaLLy3K
30035ce1c2
Merge branch 'development' into tweak/help-output
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
DL6ER
db1e5f10ea
Make changes according to comment in #1384
7 years ago
Adam Warner
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
7 years ago
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
7 years ago
Dan Schaper
b0ae954f1e
Only update when `update` flag is set to "true"
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
a2404f104a
Just some style and linting. And a `cd` in `fetch_checkout_pull_branch`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
DL6ER
38547ced7a
Can only diff once upstream branch is tracked
7 years ago
DL6ER
9a9d9007cd
Add missing "== true"
7 years ago
DL6ER
bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
7 years ago
DL6ER
1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
7 years ago
DL6ER
d4a49d192f
Correct variable name
7 years ago
DL6ER
8cb66544d2
Remove "\ "
7 years ago
DL6ER
140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
7 years ago
DL6ER
b961b13d60
Small bugfix
7 years ago
DL6ER
febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
7 years ago
DL6ER
1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
7 years ago
Dan Schaper
41e1e4cb68
Rearrange pull logic, some optimization.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
d5b88e0df8
Get the right name for the options.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
20fd61468d
Require branch to check out
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
DL6ER
81a1057cac
Fix something Dan has overlooked
7 years ago
DL6ER
fd310c6445
Back to how we had it before, because --unshallow does not work at all
7 years ago
Dan Schaper
a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
87da40068c
Always `exit`ed with value 1, now exits with proper value.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
b522d8eaf6
Source and reuse existing variables, centralize code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
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>
7 years ago
Dan Schaper
56e17d1010
Source functions and variables from basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
DL6ER
d2ab0694b7
Add "master" shortcut
7 years ago
DL6ER
8a14a63d5d
Pi-hole checkout feature
7 years ago