From 297d4eec57ae6be66b4bc28a274744c0516655a5 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:44:31 -0800 Subject: [PATCH 01/21] Start test templates. --- automated install/basic-install.sh | 5 +++-- test/test_automated_install.py | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 9fed0bca..1b643c18 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -701,8 +701,9 @@ update_pacakge_cache() { echo ":::" echo -n "::: Updating local cache of available packages..." - ${UPDATE_PKG_CACHE} &> /dev/null - echo " done!" + if ${UPDATE_PKG_CACHE}; then + echo " done!" + fi } notify_package_updates_available() { diff --git a/test/test_automated_install.py b/test/test_automated_install.py index f8e2ec3d..203c7521 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -274,6 +274,15 @@ def test_installPiholeWeb_already_populated_no_errors(Pihole): assert 'index.js' in web_directory assert 'blockingpage.css' in web_directory +def test_update_package_cache_success_no_errors(Pihole): + ''' confirms package cache was updated without any errors''' + updateCache = Pihole.run(''' + source /opt/pihole/basick-install.sh + update_pacakge_cache + ''') + assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'done!' in updateCache.stdout + # Helper functions def mock_command(script, args, container): ''' Allows for setup of commands we don't really want to have to run for real in unit tests ''' From 153a9d8ac71c51bdf4d211d2117af6fb123fa06d Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:45:25 -0800 Subject: [PATCH 02/21] Start test templates. --- test/test_automated_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 203c7521..7f287c8f 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -277,7 +277,7 @@ def test_installPiholeWeb_already_populated_no_errors(Pihole): def test_update_package_cache_success_no_errors(Pihole): ''' confirms package cache was updated without any errors''' updateCache = Pihole.run(''' - source /opt/pihole/basick-install.sh + source /opt/pihole/basic-install.sh update_pacakge_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout From 96c59fada44ef451a979d41fe1df8c89d8d1ac81 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:47:27 -0800 Subject: [PATCH 03/21] Spelling check. --- automated install/basic-install.sh | 4 ++-- test/test_automated_install.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 1b643c18..003cd312 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -692,7 +692,7 @@ enable_service() { echo " done." } -update_pacakge_cache() { +update_package_cache() { #Running apt-get update/upgrade with minimal output can cause some issues with #requiring user input (e.g password for phpmyadmin see #218) @@ -1128,7 +1128,7 @@ main() { fi # Update package cache - update_pacakge_cache + update_package_cache # Notify user of package availability notify_package_updates_available diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 7f287c8f..c502aef6 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -278,7 +278,7 @@ def test_update_package_cache_success_no_errors(Pihole): ''' confirms package cache was updated without any errors''' updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh - update_pacakge_cache + update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout assert 'done!' in updateCache.stdout From f65a9dbfd281b3f7e37e3c63d50a06c52bce3929 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:49:28 -0800 Subject: [PATCH 04/21] Test for failure. --- test/test_automated_install.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index c502aef6..7096ad91 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -283,6 +283,16 @@ def test_update_package_cache_success_no_errors(Pihole): assert 'Updating local cache of available packages...' in updateCache.stdout assert 'done!' in updateCache.stdout +def test_update_package_cache_failure_no_errors(Pihole): + ''' confirms package cache was updated without any errors''' + mock_command(apt-get, {'*':('', '1')}, Pihole) + updateCache = Pihole.run(''' + source /opt/pihole/basic-install.sh + update_package_cache + ''') + assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'done!' not in updateCache.stdout + # Helper functions def mock_command(script, args, container): ''' Allows for setup of commands we don't really want to have to run for real in unit tests ''' From f9cfed5aff68a53a062c225720bc3534d813d0f5 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:56:43 -0800 Subject: [PATCH 05/21] Test for failure. --- test/test_automated_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 7096ad91..4ab6e3a3 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -285,7 +285,7 @@ def test_update_package_cache_success_no_errors(Pihole): def test_update_package_cache_failure_no_errors(Pihole): ''' confirms package cache was updated without any errors''' - mock_command(apt-get, {'*':('', '1')}, Pihole) + mock_command('apt-get', {'*':('', '1')}, Pihole) updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh update_package_cache From a7130e6530ac4fbf4b5649ef5aff7be21859418f Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:03:48 -0800 Subject: [PATCH 06/21] Eval variable. (Not a fan.) --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 003cd312..9245ff81 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -701,7 +701,7 @@ update_package_cache() { echo ":::" echo -n "::: Updating local cache of available packages..." - if ${UPDATE_PKG_CACHE}; then + if eval ${UPDATE_PKG_CACHE}; then echo " done!" fi } From 737819b56e0d1cf736ac4cc8d73aa5273330f431 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:08:43 -0800 Subject: [PATCH 07/21] Populate all required variables with a distro check. --- test/test_automated_install.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 4ab6e3a3..04db4f1b 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -278,6 +278,7 @@ def test_update_package_cache_success_no_errors(Pihole): ''' confirms package cache was updated without any errors''' updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh + distro_check update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout @@ -288,6 +289,7 @@ def test_update_package_cache_failure_no_errors(Pihole): mock_command('apt-get', {'*':('', '1')}, Pihole) updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh + distro_check update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout From 585f8422066df137d2f288a39d2fd0ed7689ac5e Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:33:40 -0800 Subject: [PATCH 08/21] Error check. --- automated install/basic-install.sh | 2 ++ test/test_automated_install.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 9245ff81..00635e89 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -703,6 +703,8 @@ update_package_cache() { echo -n "::: Updating local cache of available packages..." if eval ${UPDATE_PKG_CACHE}; then echo " done!" + else + echo -n "\n!!! ERROR - Unable to update package cache. Please try \"${UPDATE_PKG_CACHE}\"" fi } diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 04db4f1b..29bb56d2 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -285,14 +285,15 @@ def test_update_package_cache_success_no_errors(Pihole): assert 'done!' in updateCache.stdout def test_update_package_cache_failure_no_errors(Pihole): - ''' confirms package cache was updated without any errors''' - mock_command('apt-get', {'*':('', '1')}, Pihole) + ''' confirms package cache was not updated''' + mock_command('apt-get', {'update':('', '1')}, Pihole) updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh distro_check update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'ERROR' in updateCache.stdout assert 'done!' not in updateCache.stdout # Helper functions From 2d18b2d7846b154fa48f113efb6a805ce546ecc6 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:44:31 -0800 Subject: [PATCH 09/21] Start test templates. --- automated install/basic-install.sh | 9 +++++---- test/test_automated_install.py | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 9fed0bca..003cd312 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -692,7 +692,7 @@ enable_service() { echo " done." } -update_pacakge_cache() { +update_package_cache() { #Running apt-get update/upgrade with minimal output can cause some issues with #requiring user input (e.g password for phpmyadmin see #218) @@ -701,8 +701,9 @@ update_pacakge_cache() { echo ":::" echo -n "::: Updating local cache of available packages..." - ${UPDATE_PKG_CACHE} &> /dev/null - echo " done!" + if ${UPDATE_PKG_CACHE}; then + echo " done!" + fi } notify_package_updates_available() { @@ -1127,7 +1128,7 @@ main() { fi # Update package cache - update_pacakge_cache + update_package_cache # Notify user of package availability notify_package_updates_available diff --git a/test/test_automated_install.py b/test/test_automated_install.py index f8e2ec3d..c502aef6 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -274,6 +274,15 @@ def test_installPiholeWeb_already_populated_no_errors(Pihole): assert 'index.js' in web_directory assert 'blockingpage.css' in web_directory +def test_update_package_cache_success_no_errors(Pihole): + ''' confirms package cache was updated without any errors''' + updateCache = Pihole.run(''' + source /opt/pihole/basic-install.sh + update_package_cache + ''') + assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'done!' in updateCache.stdout + # Helper functions def mock_command(script, args, container): ''' Allows for setup of commands we don't really want to have to run for real in unit tests ''' From 2a5587f23677bc65667b89ed7af93c540422201c Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 15:49:28 -0800 Subject: [PATCH 10/21] Test for failure. --- test/test_automated_install.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index c502aef6..4ab6e3a3 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -283,6 +283,16 @@ def test_update_package_cache_success_no_errors(Pihole): assert 'Updating local cache of available packages...' in updateCache.stdout assert 'done!' in updateCache.stdout +def test_update_package_cache_failure_no_errors(Pihole): + ''' confirms package cache was updated without any errors''' + mock_command('apt-get', {'*':('', '1')}, Pihole) + updateCache = Pihole.run(''' + source /opt/pihole/basic-install.sh + update_package_cache + ''') + assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'done!' not in updateCache.stdout + # Helper functions def mock_command(script, args, container): ''' Allows for setup of commands we don't really want to have to run for real in unit tests ''' From a281d87315b4fea1ae3b4e023c050a3a1efe5ad9 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:03:48 -0800 Subject: [PATCH 11/21] Eval variable. (Not a fan.) --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 003cd312..9245ff81 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -701,7 +701,7 @@ update_package_cache() { echo ":::" echo -n "::: Updating local cache of available packages..." - if ${UPDATE_PKG_CACHE}; then + if eval ${UPDATE_PKG_CACHE}; then echo " done!" fi } From 54e2c6181a5e5934f84453839e48b86be57712b1 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:08:43 -0800 Subject: [PATCH 12/21] Populate all required variables with a distro check. --- test/test_automated_install.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 4ab6e3a3..04db4f1b 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -278,6 +278,7 @@ def test_update_package_cache_success_no_errors(Pihole): ''' confirms package cache was updated without any errors''' updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh + distro_check update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout @@ -288,6 +289,7 @@ def test_update_package_cache_failure_no_errors(Pihole): mock_command('apt-get', {'*':('', '1')}, Pihole) updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh + distro_check update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout From 409f76aa34ea4c3d3b53f87e29ca9854c90c300d Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:33:40 -0800 Subject: [PATCH 13/21] Error check. --- automated install/basic-install.sh | 2 ++ test/test_automated_install.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 9245ff81..00635e89 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -703,6 +703,8 @@ update_package_cache() { echo -n "::: Updating local cache of available packages..." if eval ${UPDATE_PKG_CACHE}; then echo " done!" + else + echo -n "\n!!! ERROR - Unable to update package cache. Please try \"${UPDATE_PKG_CACHE}\"" fi } diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 04db4f1b..29bb56d2 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -285,14 +285,15 @@ def test_update_package_cache_success_no_errors(Pihole): assert 'done!' in updateCache.stdout def test_update_package_cache_failure_no_errors(Pihole): - ''' confirms package cache was updated without any errors''' - mock_command('apt-get', {'*':('', '1')}, Pihole) + ''' confirms package cache was not updated''' + mock_command('apt-get', {'update':('', '1')}, Pihole) updateCache = Pihole.run(''' source /opt/pihole/basic-install.sh distro_check update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'ERROR' in updateCache.stdout assert 'done!' not in updateCache.stdout # Helper functions From 7291aa07cabccf2727577a505fb8d42465d05177 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:46:37 -0800 Subject: [PATCH 14/21] Silenc cache updater. --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 00635e89..5540166f 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -701,7 +701,7 @@ update_package_cache() { echo ":::" echo -n "::: Updating local cache of available packages..." - if eval ${UPDATE_PKG_CACHE}; then + if eval ${UPDATE_PKG_CACHE} &> /dev/null; then echo " done!" else echo -n "\n!!! ERROR - Unable to update package cache. Please try \"${UPDATE_PKG_CACHE}\"" From 439999cb6274a26985f8e6701bb2a0c5461beaf9 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 28 Jan 2017 16:47:53 -0800 Subject: [PATCH 15/21] Last rule check. --- test/test_automated_install.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 29bb56d2..89d9a0e0 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -282,6 +282,7 @@ def test_update_package_cache_success_no_errors(Pihole): update_package_cache ''') assert 'Updating local cache of available packages...' in updateCache.stdout + assert 'ERROR' not in updateCache.stdout assert 'done!' in updateCache.stdout def test_update_package_cache_failure_no_errors(Pihole): From 8fb6ba19a10c95312a163a47d4fb390ac9951c54 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 6 Feb 2017 12:06:38 +0100 Subject: [PATCH 16/21] Remove double echos --- automated install/basic-install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 70c27fc9..7995d1dd 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -171,11 +171,9 @@ getGitFiles() { echo ":::" echo "::: Checking for existing repository..." if is_repo "${directory}"; then - echo -n "::: Updating repository in ${directory}..." update_repo "${directory}" || { echo "*** Error: Could not update local repository. Contact support."; exit 1; } echo " done!" else - echo -n "::: Cloning ${remoteRepo} into ${directory}..." make_repo "${directory}" "${remoteRepo}" || { echo "Unable to clone repository, please contact support"; exit 1; } echo " done!" fi From afe5176e017bcb9861a48d182cae5d19ce96209f Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:41:53 +0100 Subject: [PATCH 17/21] Justify help output to match main script --- advanced/Scripts/list.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index 7cbe6beb..b465bdb6 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -42,11 +42,11 @@ helpFunc() { ::: Usage: pihole -${letter} domain1 [domain2 ...] ::: ::: Options: -::: -d, --delmode Remove domains from the ${word}list -::: -nr, --noreload Update ${word}list without refreshing dnsmasq -::: -q, --quiet output is less verbose -::: -h, --help Show this help dialog -::: -l, --list Display your ${word}listed domains +::: -d, --delmode Remove domains from the ${word}list +::: -nr, --noreload Update ${word}list without refreshing dnsmasq +::: -q, --quiet Output is less verbose +::: -h, --help Show this help dialog +::: -l, --list Display your ${word}listed domains EOM if [[ "${letter}" == "b" ]]; then echo "::: -wild, --wildcard Add whitecard entry (only blacklist)" @@ -229,4 +229,3 @@ PoplistFile if ${reload}; then Reload fi - From 19e30b829ab913fae62001842443ee70aafae710 Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:42:14 +0100 Subject: [PATCH 18/21] Add wildcard description to help text, improve other help texts --- pihole | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pihole b/pihole index 89c22ec8..b3fc2367 100755 --- a/pihole +++ b/pihole @@ -274,19 +274,20 @@ helpFunc() { ::: Add -h after -w (whitelist), -b (blacklist), -c (chronometer), or -a (admin) for more information on usage ::: ::: Options: -::: -w, whitelist Whitelist domains -::: -b, blacklist Blacklist domains -::: -d, debug Start a debugging session if having trouble -::: -f, flush Flush the pihole.log file -::: -t, tail Output the last lines of the pihole.log file. Lines are appended as the file grows -::: -up, updatePihole Update Pi-hole +::: -w, whitelist Whitelist domain(s) +::: -b, blacklist Blacklist domain(s) (exact match) +::: -wild, wildcard Blacklist whole domain(s) (wildcard) +::: -d, debug Start a debugging session +::: -f, flush Flush the 'pihole.log' file +::: -t, tail Output the last lines of the 'pihole.log' file. Lines are appended as the file grows +::: -up, updatePihole Update Pi-hole components ::: -r, reconfigure Reconfigure or Repair Pi-hole ::: -g, updateGravity Update the list of ad-serving domains ::: -c, chronometer Calculates stats and displays to an LCD ::: -h, help Show this help dialog -::: -v, version Show current versions +::: -v, version Show installed versions of Pi-Hole and Web-Admin ::: -q, query Query the adlists for a specific domain -::: Use pihole -q domain -exact if you want to see exact matches only +::: Use 'pihole -q domain -exact' if you want to see exact matches only ::: -l, logging Enable or Disable logging (pass 'on' or 'off') ::: -a, admin Admin webpage options ::: uninstall Uninstall Pi-Hole from your system :(! @@ -294,7 +295,7 @@ helpFunc() { ::: enable Enable Pi-Hole DNS Blocking ::: disable Disable Pi-Hole DNS Blocking ::: Blocking can also be disabled only temporarily, e.g., -::: pihole disable 5m - will disable blocking for 5 minutes +::: 'pihole disable 5m' - will disable blocking for 5 minutes ::: restartdns Restart dnsmasq EOM exit 0 From 8037f3e3323a20c01725979f0f5b0be787d64fbb Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:55:14 +0100 Subject: [PATCH 19/21] Fix spacing for wildcard help in list script --- advanced/Scripts/list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index b465bdb6..64a24bf3 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -49,7 +49,7 @@ helpFunc() { ::: -l, --list Display your ${word}listed domains EOM if [[ "${letter}" == "b" ]]; then - echo "::: -wild, --wildcard Add whitecard entry (only blacklist)" + echo "::: -wild, --wildcard Add wildcard entry (only blacklist)" fi exit 0 } From 01f643e5eb2f5c851fdbdbcaace81ecae459c0ab Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:56:28 +0100 Subject: [PATCH 20/21] fixup! Fix spacing for wildcard help in list script --- advanced/Scripts/list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index 64a24bf3..4634837a 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -49,7 +49,7 @@ helpFunc() { ::: -l, --list Display your ${word}listed domains EOM if [[ "${letter}" == "b" ]]; then - echo "::: -wild, --wildcard Add wildcard entry (only blacklist)" + echo "::: -wild, --wildcard Add wildcard entry (only blacklist)" fi exit 0 } From 34f326c55970e57f9ff2675696291af29b4bfada Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Wed, 8 Feb 2017 14:13:49 -0800 Subject: [PATCH 21/21] Update basic-install.sh --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 7995d1dd..469cd393 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -77,8 +77,8 @@ if command -v apt-get &> /dev/null; then phpVer="php5" fi # ######################################### - INSTALLER_DEPS=(apt-utils debconf dhcpcd5 git whiptail) - PIHOLE_DEPS=(bc cron curl dnsmasq dnsutils ${iproute_pkg} iputils-ping lighttpd lsof netcat ${phpVer}-common ${phpVer}-cgi sudo unzip wget) + INSTALLER_DEPS=(apt-utils debconf dhcpcd5 git ${iproute_pkg} whiptail) + PIHOLE_DEPS=(bc cron curl dnsmasq dnsutils iputils-ping lighttpd lsof netcat ${phpVer}-common ${phpVer}-cgi sudo unzip wget) LIGHTTPD_USER="www-data" LIGHTTPD_GROUP="www-data" LIGHTTPD_CFG="lighttpd.conf.debian"