|
|
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 |
|
|
|
38ba079baa
|
Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
Don't try to obtain version of web interface it it is not installed
|
2017-03-10 14:33:12 +01:00 |
|
|
|
33f7979359
|
Merge pull request #1293 from pi-hole/fix/version
Account for hash in versioning
|
2017-03-10 14:32:52 +01:00 |
|
|
|
8460b2544b
|
Merge pull request #1295 from pi-hole/tweak/pullapprove
Require 4 approvals instead of five for merging into master
|
2017-03-10 14:31:53 +01:00 |
|
|
|
bc514ea955
|
Merge pull request #1296 from pi-hole/fix/debugVersion
Debug version detection improvements
|
2017-03-10 14:30:50 +01:00 |
|
|
|
6f8893d950
|
Merge pull request #1301 from pi-hole/fix/removewildcard
Remove wildcard entry when adding the very same domain either the white- or blacklist
|
2017-03-10 14:29:38 +01:00 |
|
|
|
de6aaf18ab
|
Merge pull request #1302 from pi-hole/fix/nowildcardlistfile
Check for existence of wildcard blocking list (query adlists)
|
2017-03-10 14:29:13 +01:00 |
|
|
|
0fe64cf5cc
|
Merge pull request #1300 from pi-hole/fix/deletehostrecord
Bugfix for when deleting host-record
|
2017-03-10 14:28:52 +01:00 |
|
|
|
9a95531fb9
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
2017-03-10 14:24:15 +01:00 |
|
|
|
9df6a8dd06
|
Merge pull request #1311 from pi-hole/tweak/ascii-berry
add ascii berry to beginning of installer
|
2017-03-09 13:40:57 -05:00 |
|
|
|
1590a179fa
|
Change 302 redirect to 301
Change "302 Found" response to "301 Moved Permanently", as "302 Found" is meant for temporary redirects.
Was asked to do so in this comment: https://github.com/pi-hole/pi-hole/pull/1297#issuecomment-284335421
|
2017-03-09 17:38:56 +11:00 |
|
|
|
5e16487ef6
|
add ascii berry to beginning of installer
|
2017-03-08 21:14:21 -06:00 |
|
|
|
2b3afbfef8
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
2017-03-09 00:43:35 +01:00 |
|
|
|
c3c7dcc9f5
|
Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout
|
2017-03-08 15:32:14 -08:00 |
|
|
|
273728b481
|
One more argument to shift.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 15:32:06 -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 |
|
|
|
708067e875
|
Merge pull request #1309 from pi-hole/new/FTLChronometer
Remove duplicated line
|
2017-03-08 13:27:11 +01: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 |
|
|
|
8235b18854
|
Remove duplicated line
|
2017-03-08 12:09:34 +01:00 |
|
|
|
e0e9ebbe74
|
Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
Don't try to obtain version of web interface it it is not installed
|
2017-03-07 23:54:32 +01:00 |
|
|
|
6e6259975e
|
Merge pull request #1308 from pi-hole/new/FTLChronometer
Let Chronometer query all data from FTL directly
|
2017-03-07 19:41:23 +01:00 |
|
|
|
10bc8414b9
|
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
|
2017-03-07 18:10:05 +01:00 |
|
|
|
4e25e0dc5c
|
Add missing } to JSON output
|
2017-03-07 17:57:57 +01:00 |
|
|
|
b1a9793d94
|
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
|
2017-03-07 17:54:11 +01:00 |
|
|
|
6dea00668e
|
Don't try to obtain version of web interface it it is not installed. Fixes #1303
|
2017-03-07 13:08:01 +01:00 |
|
|
|
ae9182c92e
|
Merge pull request #1301 from pi-hole/fix/removewildcard
Remove wildcard entry when adding the very same domain either the white- or blacklist
|
2017-03-06 23:53:06 +01:00 |
|
|
|
af17355fe7
|
Merge pull request #1302 from pi-hole/fix/nowildcardlistfile
Check for existence of wildcard blocking list (query adlists)
|
2017-03-06 17:03:34 +01:00 |
|
|
|
dce3e50a00
|
Check for existence of wildcard blocking list before trying to acces it
|
2017-03-06 16:44:56 +01:00 |
|
|
|
cf31561267
|
Remove wildcard entry when adding the very same domain either the white- or blacklist
|
2017-03-06 16:25:35 +01:00 |
|
|
|
a97f0b1298
|
Merge pull request #1300 from pi-hole/fix/deletehostrecord
Bugfix for when deleting host-record
|
2017-03-06 16:16:42 +01:00 |
|
|
|
d1e0f3ae18
|
Merge pull request #1294 from pi-hole/tweak/debugDNS
Tweak DNS debugging
|
2017-03-06 05:50:37 -08:00 |
|
|
|
47a6786e8f
|
Use proper test syntax
|
2017-03-06 14:02:56 +01:00 |
|
|
|
a69fcbb91e
|
Bugfix for when deleting host-record
|
2017-03-06 13:44:13 +01:00 |
|
|
|
8e2b51b391
|
Merge pull request #1296 from pi-hole/fix/debugVersion
Debug version detection improvements
|
2017-03-05 07:13:41 -08:00 |
|
|
|
560af43204
|
Merge pull request #1293 from pi-hole/fix/version
Account for hash in versioning
|
2017-03-05 07:10:18 -08:00 |
|
|
|
9c119f919e
|
Merge pull request #1298 from pi-hole/new/teleporter
Add CLI Teleporter feature
|
2017-03-05 15:05:07 +01:00 |
|
|
|
baefec86f2
|
Add CLI teleporter feature
|
2017-03-05 14:08:44 +01:00 |
|
