Dan Schaper
|
a832dd7f67
|
Update .editorconfig
Set path for JS source.
|
7 years ago |
Dan Schaper
|
598a7b3cc0
|
Add .editorconfig
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
DL6ER
|
8b060e9699
|
Merge pull request #1333 from Wandmalfarbe/development
Fixed minor spelling mistakes in README.md
|
7 years ago |
Dan Schaper
|
073c7e54df
|
Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint
add check on file_parse to not include WEBPASSWORD= in the debug log
|
7 years ago |
Wandmalfarbe
|
ab2af11775
|
Fixed minor spelling mistakes in README.md
|
7 years ago |
Adam Warner
|
cfaf1ac67c
|
add check on file_parse to not include WEBPASSWORD= in the debug log
|
7 years ago |
Mcat12
|
a6caa0e680
|
Merge pull request #1327 from pi-hole/fix/pihole-help-text
Fix help text bug
|
7 years ago |
Mcat12
|
c4b43f92ce
|
Fix help text bug
Fixes #1325
|
7 years ago |
Mcat12
|
88835512dd
|
Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
Only remove from wildcard list if domain is being added to whitelist …
|
7 years ago |
Adam Warner
|
6b862dd9e9
|
Only remove from wildcard list if domain is being added to whitelist or blacklist
|
7 years ago |
DL6ER
|
be0b76c954
|
Merge pull request #1319 from pi-hole/fix/gravitypath
Use absolute path for pihole command in gravity.sh
|
7 years ago |
DL6ER
|
d7b5870ba6
|
Use absolute path for pihole command in gravity.sh. Fixes #1318
|
7 years ago |
Dan Schaper
|
2e74219ff9
|
Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
|
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 |
Mcat12
|
9df6a8dd06
|
Merge pull request #1311 from pi-hole/tweak/ascii-berry
add ascii berry to beginning of installer
|
7 years ago |
Jacob Salmela
|
5e16487ef6
|
add ascii berry to beginning of installer
|
7 years ago |
DL6ER
|
2b3afbfef8
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
7 years ago |
Dan Schaper
|
c3c7dcc9f5
|
Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout
|
7 years ago |
Dan Schaper
|
273728b481
|
One more argument to shift.
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
|
708067e875
|
Merge pull request #1309 from pi-hole/new/FTLChronometer
Remove duplicated line
|
7 years ago |
DL6ER
|
d2ab0694b7
|
Add "master" shortcut
|
7 years ago |
DL6ER
|
8a14a63d5d
|
Pi-hole checkout feature
|
7 years ago |
DL6ER
|
8235b18854
|
Remove duplicated line
|
7 years ago |
DL6ER
|
e0e9ebbe74
|
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 |
DL6ER
|
6e6259975e
|
Merge pull request #1308 from pi-hole/new/FTLChronometer
Let Chronometer query all data from FTL directly
|
7 years ago |
DL6ER
|
10bc8414b9
|
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
|
7 years ago |
DL6ER
|
4e25e0dc5c
|
Add missing } to JSON output
|
7 years ago |