Commit Graph

  • a2404f104a Just some style and linting. And a cd in fetch_checkout_pull_branch Dan Schaper 2017-03-11 12:21:15 -08:00
  • 38547ced7a Can only diff once upstream branch is tracked DL6ER 2017-03-11 16:55:37 +01:00
  • 9a9d9007cd Add missing "== true" DL6ER 2017-03-11 16:49:47 +01:00
  • bd2d81f691 source setupVars.conf to see if INSTALL_WEB is true or not DL6ER 2017-03-11 16:46:52 +01:00
  • 1b9e7fbf2e Test if branch is locally available is not reliable because of possible ambiguities DL6ER 2017-03-11 16:40:10 +01:00
  • d4a49d192f Correct variable name DL6ER 2017-03-11 16:38:28 +01:00
  • 8cb66544d2 Remove "\ " DL6ER 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) DL6ER 2017-03-11 16:30:58 +01:00
  • b961b13d60 Small bugfix DL6ER 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) DL6ER 2017-03-11 16:24:13 +01:00
  • 1d60b62e7a Testing alternative way of fetching/checking out of a single branch DL6ER 2017-03-11 16:11:23 +01:00
  • 41e1e4cb68 Rearrange pull logic, some optimization. Dan Schaper 2017-03-10 11:25:35 -08:00
  • d5b88e0df8 Get the right name for the options. Dan Schaper 2017-03-10 11:07:58 -08:00
  • 20fd61468d Require branch to check out Dan Schaper 2017-03-10 11:04:37 -08:00
  • 0a0d25dff4 Script runs in subshell, no need to cd back to pwd. Dan Schaper 2017-03-10 10:57:46 -08:00
  • 38ba079baa Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface DL6ER 2017-03-07 23:54:32 +01:00
  • 33f7979359 Merge pull request #1293 from pi-hole/fix/version Dan Schaper 2017-03-05 07:10:18 -08:00
  • 8460b2544b Merge pull request #1295 from pi-hole/tweak/pullapprove Dan Schaper 2017-03-04 15:17:25 -08:00
  • bc514ea955 Merge pull request #1296 from pi-hole/fix/debugVersion Dan Schaper 2017-03-05 07:13:41 -08:00
  • 6f8893d950 Merge pull request #1301 from pi-hole/fix/removewildcard DL6ER 2017-03-06 23:53:06 +01:00
  • de6aaf18ab Merge pull request #1302 from pi-hole/fix/nowildcardlistfile DL6ER 2017-03-06 17:03:34 +01:00
  • 0fe64cf5cc Merge pull request #1300 from pi-hole/fix/deletehostrecord DL6ER 2017-03-06 16:16:42 +01:00
  • 9a95531fb9 Merge pull request #1310 from pi-hole/new/piholecheckout DL6ER 2017-03-09 00:43:35 +01:00
  • 9df6a8dd06 Merge pull request #1311 from pi-hole/tweak/ascii-berry Mcat12 2017-03-09 13:40:57 -05:00
  • 1590a179fa Change 302 redirect to 301 raincoats 2017-03-09 17:38:56 +11:00
  • 5e16487ef6 add ascii berry to beginning of installer Jacob Salmela 2017-03-08 21:14:21 -06:00
  • 2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout DL6ER 2017-03-09 00:43:35 +01:00
  • c3c7dcc9f5 Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout Dan Schaper 2017-03-08 15:32:14 -08:00
  • 273728b481 One more argument to shift. Dan Schaper 2017-03-08 15:32:06 -08:00
  • 81a1057cac Fix something Dan has overlooked DL6ER 2017-03-09 00:30:36 +01:00
  • fd310c6445 Back to how we had it before, because --unshallow does not work at all DL6ER 2017-03-09 00:28:02 +01:00
  • a9b52518bf Shift numbers for argument identifiers, functions are called after shift Dan Schaper 2017-03-08 14:29:51 -08:00
  • 87da40068c Always exited with value 1, now exits with proper value. Dan Schaper 2017-03-08 14:17:20 -08:00
  • b8f1eadb7f Shift off checkout from being passed to script from pihole Dan Schaper 2017-03-08 13:57:35 -08:00
  • b522d8eaf6 Source and reuse existing variables, centralize code. Dan Schaper 2017-03-08 13:41:11 -08:00
  • 89ff99322d Don't need to remember pwd inside a function, calling function doesn't change directories. Dan Schaper 2017-03-08 13:30:08 -08:00
  • 56e17d1010 Source functions and variables from basic-install.sh Dan Schaper 2017-03-08 13:27:48 -08:00
  • 708067e875 Merge pull request #1309 from pi-hole/new/FTLChronometer DL6ER 2017-03-08 13:27:11 +01:00
  • d2ab0694b7 Add "master" shortcut DL6ER 2017-03-08 13:18:34 +01:00
  • 8a14a63d5d Pi-hole checkout feature DL6ER 2017-03-08 13:16:40 +01:00
  • 8235b18854 Remove duplicated line DL6ER 2017-03-08 12:09:34 +01:00
  • e0e9ebbe74 Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface DL6ER 2017-03-07 23:54:32 +01:00
  • 6e6259975e Merge pull request #1308 from pi-hole/new/FTLChronometer DL6ER 2017-03-07 19:41:23 +01:00
  • 10bc8414b9 Move FTL querying before clearing the terminal to avoid flashing on Pi B+ DL6ER 2017-03-07 18:10:05 +01:00
  • 4e25e0dc5c Add missing } to JSON output DL6ER 2017-03-07 17:57:57 +01:00
  • b1a9793d94 Let Chronometer query all data from FTL (no need for having the API). Fixes #1305 DL6ER 2017-03-07 17:53:36 +01:00
  • 6dea00668e Don't try to obtain version of web interface it it is not installed. Fixes #1303 DL6ER 2017-03-07 13:07:34 +01:00
  • ae9182c92e Merge pull request #1301 from pi-hole/fix/removewildcard DL6ER 2017-03-06 23:53:06 +01:00
  • af17355fe7 Merge pull request #1302 from pi-hole/fix/nowildcardlistfile DL6ER 2017-03-06 17:03:34 +01:00
  • dce3e50a00 Check for existence of wildcard blocking list before trying to acces it DL6ER 2017-03-06 16:44:56 +01:00
  • cf31561267 Remove wildcard entry when adding the very same domain either the white- or blacklist DL6ER 2017-03-06 16:24:12 +01:00
  • a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord DL6ER 2017-03-06 16:16:42 +01:00
  • d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS Dan Schaper 2017-03-06 05:50:37 -08:00
  • 47a6786e8f Use proper test syntax DL6ER 2017-03-06 14:02:56 +01:00
  • a69fcbb91e Bugfix for when deleting host-record DL6ER 2017-03-06 13:44:13 +01:00
  • 8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion Dan Schaper 2017-03-05 07:13:41 -08:00
  • 560af43204 Merge pull request #1293 from pi-hole/fix/version Dan Schaper 2017-03-05 07:10:18 -08:00
  • 9c119f919e Merge pull request #1298 from pi-hole/new/teleporter DL6ER 2017-03-05 15:05:07 +01:00
  • baefec86f2 Add CLI teleporter feature DL6ER 2017-03-05 14:08:44 +01:00
  • eb763d2dc2 Redirect to admin panel when accessing 'http://pi.hole/' raincoats 2017-03-05 16:58:21 +11:00
  • 512c650441 Shellchecking. Dan Schaper 2017-03-04 19:05:32 -08:00
  • dc44fc9e27 Version check amalgamation and removal of && || logic. Dan Schaper 2017-03-04 17:54:38 -08:00
  • 05640f9a6b Merge pull request #1295 from pi-hole/tweak/pullapprove Dan Schaper 2017-03-04 15:17:25 -08:00
  • 6f2fb57c08 Protocol specific records checks. Dan Schaper 2017-03-04 15:16:33 -08:00
  • 2547cc4c8d Only run IPv6 if enabled, split out Chaos TXT checks. Dan Schaper 2017-03-04 15:06:34 -08:00
  • 112ddb3c77 Require 4 approvals instead of five for merging into master DL6ER 2017-03-04 22:57:37 +01:00
  • 9f4ef66f41 Add IPv6 resolver test DL6ER 2017-03-04 22:38:52 +01:00
  • 086f0790fc Add Google's IPv6 address for potential IPv6 resolver tests DL6ER 2017-03-04 22:31:18 +01:00
  • 709b44f736 IPv4 DNS tests Dan Schaper 2017-03-04 12:16:16 -08:00
  • 6cd4ff6d68 Organize functions and function calls. Dan Schaper 2017-03-04 11:34:34 -08:00
  • abd3e828de Optimize normalOutput Dan Schaper 2017-03-04 07:46:00 -08:00
  • b85af50d14 Generate only the information that is actually asked for DL6ER 2017-03-04 14:08:11 +01:00
  • 0e8fd49669 Function... Dan Schaper 2017-03-03 23:30:57 -08:00
  • 945e22874e Collapse duplicate functions, and take out argument loops. Dan Schaper 2017-03-03 23:12:28 -08:00
  • 77ab47a984 Awk for perl Dan Schaper 2017-03-03 22:34:55 -08:00
  • ed8088f203 Functions for Core/Web version and hash. And only check first argument in each section. Dan Schaper 2017-03-03 22:10:32 -08:00
  • 8831b22fc8 Prototype function for getting version of local repo Dan Schaper 2017-03-03 21:36:38 -08:00
  • 0341bd1758 Optimize code, undoc flag for current hash. Dan Schaper 2017-03-03 20:32:26 -08:00
  • 9bb4a5fb25 Factor out variables from display. Dan Schaper 2017-03-03 20:16:53 -08:00
  • ebfffea5dc Always show something, even if it's just the short hash of the latest commit. Dan Schaper 2017-03-03 20:04:55 -08:00
  • 81939ab265 Get short hash of local and remote Dan Schaper 2017-03-03 19:14:30 -08:00
  • f2fe84c9d3 Merge pull request #1292 from pi-hole/master DL6ER 2017-03-03 23:45:29 +01:00
  • 051f463350 Merge pull request #1291 from pi-hole/fix/defaultlisteningbehavior v2.13.1 DL6ER 2017-03-03 23:33:44 +01:00
  • f626406685 Revert #1273 DL6ER 2017-03-03 23:14:12 +01:00
  • dd971b6ee5 Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins) DL6ER 2017-03-03 22:58:41 +01:00
  • 8776b822db Merge pull request #1287 from pi-hole/fix/update_fail Dan Schaper 2017-03-03 12:20:29 -08:00
  • fc76b1a6a3 Merge pull request #1244 from pi-hole/new/FTL-binary DL6ER 2017-03-03 13:41:27 +01:00
  • 9183200b6f Merge pull request #1286 from pi-hole/tweak/dpkg_lock DL6ER 2017-03-03 13:39:40 +01:00
  • f1b8abf503 Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked DL6ER 2017-03-03 12:20:43 +01:00
  • 9502356980 Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress DL6ER 2017-03-03 11:52:49 +01:00
  • a535ca9db4 Some tweaks to the new dpkg lock detector DL6ER 2017-03-03 11:35:44 +01:00
  • 2c762899de Add loop to wait if package manager is blocked externally DL6ER 2017-03-03 11:28:35 +01:00
  • 24fd23493d Exit script immediately if we can't update package cache. Dan Schaper 2017-03-02 15:54:58 -08:00
  • 6f1ed28d0a Merge pull request #1274 from pi-hole/development v2.13 Dan Schaper 2017-03-02 14:34:43 -08:00
  • 66b7d04b82 Merge branch 'development' into new/FTL-binary DL6ER 2017-03-01 12:42:48 +01:00
  • 044afa838c Merge pull request #1284 from pi-hole/new/dnsmasqListeningBehavior DL6ER 2017-03-01 12:20:59 +01:00
  • 7ba47f504c Add special "except-interface" line in case of listening on all interfaces DL6ER 2017-03-01 12:15:04 +01:00
  • 0be1717ff4 Fix config error DL6ER 2017-03-01 11:46:48 +01:00
  • 189a4e0078 Add option to skip restarting of dnsmasq DL6ER 2017-03-01 11:26:06 +01:00
  • 3adf8785d8 Move "all" down in help text to not suggest that it is the default DL6ER 2017-03-01 11:07:05 +01:00