rebase on development branch

Copy some scripts from basic_install.sh. Add todo list comments.
Flesh out updateDependencies. Add in root check.
2016-05-13 11:13:47 +01:00 · 2016-05-13 11:12:19 +01:00 · 2016-05-13 11:12:19 +01:00 · 2016-05-13 11:12:19 +01:00 · 2016-05-13 11:12:19 +01:00 · 2016-05-13 11:12:19 +01:00
48 changed files with 2619 additions and 4804 deletions
@@ -1,38 +0,0 @@
 # FROM https://github.com/libgit2/libgit2sharp
 # Text files that should be normalized to LF in odb.
 *.cs     text diff=csharp
 *.config text
 *.sln     text
 *.csproj  text
 *.md       text
 *.sh       text
 *.ps1      text
 *.cmd      text
 *.bat      text
 *.markdown text
 *.msbuild  text
 Lib/*  binary
 GitHub.Tests.Integration/Resources/*  binary
 # Binary files that should not be normalized or diffed
 *.png    binary
 *.jpg    binary
 *.gif    binary
 *.pfx    binary
 *.snk    binary
 *.dll    binary
 *.exe    binary
 *.lib    binary
 *.exp    binary
 *.pdb    binary
 *.sdf    binary
 *.7z     binary
 # Catch all for anything we forgot. Add rules if you get CRLF -> LF warnings.
 * text eol=lf
@@ -1,33 +1,7 @@
-**In raising this issue, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your issue:**
+##### Expected Behaviour:
 - [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md).
 - [] The issue I am reporting can be *replicated*
 - [] The issue I'm reporting isn't a duplicate (see [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/pi-hole/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), and [open issues](https://github.com/pi-hole/pi-hole/issues)).
 **How familiar are you with the codebase?:**
 _{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_
 ---
 **[FEATURE REQUEST | QUESTION | OTHER]:**
 Please [submit your feature request here](https://discourse.pi-hole.net/c/feature-requests), so it is votable by the community.  It's also easier for us to track.
 **[BUG | ISSUE] Expected Behaviour:**
-**[BUG | ISSUE] Actual Behaviour:**
+##### Actual Behaviour:
-**[BUG | ISSUE] Steps to reproduce:**
+##### Steps to reproduce this issue:
 -
 -
 -
 -
 **(Optional) Debug token generated by `pihole -d`:**
 `<token>`
 _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._
@@ -1,19 +1,11 @@
-**By submitting this pull request, I confirm the following (please check boxes, eg [X]) _Failure to fill the template will close your PR_:**
+Fixes #[issue number] .
-***Please submit all pull requests against the `development` branch. Failure to do so will delay or deny your request***
+Changes proposed in this pull request:
- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md).
+- 
 - [] I have checked that [another pull request](https://github.com/pi-hole/pi-hole/pulls) for this purpose does not exist.
 - [] I have considered, and confirmed that this submission will be valuable to others.
 - [] I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
 - [] I give this submission freely, and claim no ownership to its content.
-**How familiar are you with the codebase?:**
+- 
-_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_
+- 
---
+@pi-hole/gravity
 _{replace this line with your pull request content}_
 _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._
@@ -1,7 +1 @@
 .DS_Store
 *.pyc
 *.swp
 __pycache__
 .cache
 .pullapprove.yml
@@ -1,25 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
    <component name="ProjectCodeStyleSettingsManager">
        <option name="PER_PROJECT_SETTINGS">
            <value>
                <option name="OTHER_INDENT_OPTIONS">
                    <value>
                        <option name="INDENT_SIZE" value="2" />
                        <option name="CONTINUATION_INDENT_SIZE" value="8" />
                        <option name="TAB_SIZE" value="2" />
                        <option name="USE_TAB_CHARACTER" value="false" />
                        <option name="SMART_TABS" value="false" />
                        <option name="LABEL_INDENT_SIZE" value="0" />
                        <option name="LABEL_INDENT_ABSOLUTE" value="false" />
                        <option name="USE_RELATIVE_INDENTS" value="false" />
                    </value>
                </option>
                <MarkdownNavigatorCodeStyleSettings>
                    <option name="RIGHT_MARGIN" value="72" />
                </MarkdownNavigatorCodeStyleSettings>
            </value>
        </option>
        <option name="USE_PER_PROJECT_SETTINGS" value="true" />
    </component>
 </project>
@@ -1,38 +0,0 @@
 version: 2
 always_pending:
  title_regex: '(WIP|wip)'  
  labels:
    - wip
  explanation: 'This PR is a work in progress...'
 group_defaults:
  reset_on_push:
    enabled: true
  reject_value: -2
  approve_regex: '^(Approved|:shipit:|:\+1:|Engage)'
  reject_regex: '^(Rejected|:-1:|Borg)'
  author_approval:
    auto: true
 groups:
  development:
    approve_by_comment:
      enabled: true
    conditions:
      branches:
        - development        
    required: 2
    teams:
      - approvers
  master:
    approve_by_comment:
      enabled: true
    conditions:
      branches:
        - master
    required: -1
    teams:
      - admin
@@ -1,10 +0,0 @@
 sudo: required
 services:
  - docker
 language: python
 python:
  - "2.7"
 install:
  - pip install -r requirements.txt
 script: py.test -vv
@@ -1,38 +1,8 @@
-_This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._
+This is a basic checklist for now, We will update it in the future.
-# Contributors Guide
+* Fork the repo and create your new branch based on the `development` branch.
-
+* Commit Unix line endings
-Please read and understand the contribution guide before creating an issue or pull request.
+* If you want, try to keep to the theme of black holes/gravity. This can add some fun to your submission.
-
+* Submit Pull Requests to the development branch only.
-## Etiquette
+* Before Submitting your Pull Request, merge `development` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
-
+* Be patient. We will review all submitted pull requests, but our focus is on stability.. please don't be offended if we reject your PR, or it appears we're doing nothing with it! We'll get around to it..
 - Our goal for Pi-hole is **stability before features**.  This means we focus on squashing critical bugs before adding new features.  Often, we can do both in tandem, but bugs will take priority over a new feature.
 - Pi-hole is open source and [powered by donations](https://pi-hole.net/donate/), and as such, we give our **free time** to build, maintain, and **provide user support** for this project.  It would be extremely unfair for us to suffer abuse or anger for our hard work, so please take a moment to consider that.
 - Please be considerate towards the developers and other users when raising issues or presenting pull requests.
 - Respect our decision(s), and do not be upset or abusive if your submission is not used.
 ## Viability
 When requesting or submitting new features, first consider whether it might be useful to others. Open source projects are used by many people, who may have entirely different needs to your own. Think about whether or not your feature is likely to be used by other users of the project.
 ## Procedure
 **Before filing an issue:**
 - Attempt to replicate and **document** the problem, to ensure that it wasn't a coincidental incident.
 - Check to make sure your feature suggestion isn't already present within the project.
 - Check the pull requests tab to ensure that the bug doesn't have a fix in progress.
 - Check the pull requests tab to ensure that the feature isn't already in progress.
 **Before submitting a pull request:**
 - Check the codebase to ensure that your feature doesn't already exist.
 - Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
 ## Technical Requirements
 - Submit Pull Requests to the **development branch only**.
 - Before Submitting your Pull Request, merge `development` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
 - Please use the [Google Style Guide for Shell](https://google.github.io/styleguide/shell.xml) for your code submission styles. 
 - Commit Unix line endings.
 - (Optional fun) keep to the theme of Star Trek/black holes/gravity.
@@ -1,167 +1,339 @@
-Copyright (C) 2017 Pi-hole, LLC (https://pi-hole.net)
+GNU GENERAL PUBLIC LICENSE
-Pi-hole Core
+                       Version 2, June 1991
-
+
-This software is licensed under the European Union Public License (EUPL)
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
-The license is available in the 22 official languages of the EU. The English version is included here.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-Please see https://joinup.ec.europa.eu/community/eupl/og_page/eupl for official translations of the other languages.
+ Everyone is permitted to copy and distribute verbatim copies
-
+ of this license document, but changing it is not allowed.
-This license applies to the whole project EXCEPT:
+
-
+                            Preamble
- - any commits made to the master branch prior to the release of version 3.0
+
-
+  The licenses for most software are designed to take away your
-The licenses that existed prior to this change have remained intact.
+freedom to share and change it.  By contrast, the GNU General Public
-
+License is intended to guarantee your freedom to share and change free
-------------------------------------------------------------
+software--to make sure the software is free for all its users.  This
-
+General Public License applies to most of the Free Software
-European Union Public Licence
+Foundation's software and to any other program whose authors commit to
-V. 1.1
+using it.  (Some other Free Software Foundation software is covered by
-
+the GNU Lesser General Public License instead.)  You can apply it to
-EUPL (C) the European Community 2007
+your programs, too.
-
+
-This European Union Public Licence (the "EUPL") applies to the Work or Software (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright holder of the Work).
+  When we speak of free software, we are referring to freedom, not
-
+price.  Our General Public Licenses are designed to make sure that you
-The Original Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the copyright notice for the Original Work:
+have the freedom to distribute copies of free software (and charge for
-
+this service if you wish), that you receive source code or can get it
-Licensed under the EUPL V.1.1
+if you want it, that you can change the software or use pieces of it
-
+in new free programs; and that you know you can do these things.
-or has expressed by any other mean his willingness to license under the EUPL.
+
-
+  To protect your rights, we need to make restrictions that forbid
-1. Definitions
+anyone to deny you these rights or to ask you to surrender the rights.
-
+These restrictions translate to certain responsibilities for you if you
-In this Licence, the following terms have the following meaning:
+distribute copies of the software, or if you modify it.
-
+
- The Licence: this Licence.
+  For example, if you distribute copies of such a program, whether
-
+gratis or for a fee, you must give the recipients all the rights that
- The Original Work or the Software: the software distributed and/or communicated by the Licensor under this Licence, available as Source Code and also as Executable Code as the case may be.
+you have.  You must make sure that they, too, receive or can get the
-
+source code.  And you must show them these terms so they know their
- Derivative Works: the works or software that could be created by the Licensee, based upon the Original Work or modifications thereof. This Licence does not define the extent of modification or dependence on the Original Work required in order to classify a work as a Derivative Work; this extent is determined by copyright law applicable in the country mentioned in Article 15.
+rights.
-
+
- The Work: the Original Work and/or its Derivative Works.
+  We protect your rights with two steps: (1) copyright the software, and
-
+(2) offer you this license which gives you legal permission to copy,
- The Source Code: the human-readable form of the Work which is the most convenient for people to study and modify.
+distribute and/or modify the software.
-
+
- The Executable Code: any code which has generally been compiled and which is meant to be interpreted by a computer as a program.
+  Also, for each author's protection and ours, we want to make certain
-
+that everyone understands that there is no warranty for this free
- The Licensor: the natural or legal person that distributes and/or communicates the Work under the Licence.
+software.  If the software is modified by someone else and passed on, we
-
+want its recipients to know that what they have is not the original, so
- Contributor(s): any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work.
+that any problems introduced by others will not reflect on the original
-
+authors' reputations.
- The Licensee or "You": any natural or legal person who makes any usage of the Software under the terms of the Licence.
+
-
+  Finally, any free program is threatened constantly by software
- Distribution and/or Communication: any act of selling, giving, lending, renting, distributing, communicating, transmitting, or otherwise making available, on-line or off-line, copies of the Work or providing access to its essential functionalities at the disposal of any other natural or legal person.
+patents.  We wish to avoid the danger that redistributors of a free
-
+program will individually obtain patent licenses, in effect making the
-2. Scope of the rights granted by the Licence
+program proprietary.  To prevent this, we have made it clear that any
-
+patent must be licensed for everyone's free use or not licensed at all.
-The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, sub-licensable licence to do the following, for the duration of copyright vested in the Original Work:
+
-
+  The precise terms and conditions for copying, distribution and
- use the Work in any circumstance and for all usage,
+modification follow.
- reproduce the Work,
+
- modify the Original Work, and make Derivative Works based upon the Work,
+                    GNU GENERAL PUBLIC LICENSE
- communicate to the public, including the right to make available or display the Work or copies thereof to the public and perform publicly, as the case may be, the Work,
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- distribute the Work or copies thereof,
+
- lend and rent the Work or copies thereof,
+  0. This License applies to any program or other work which contains
- sub-license rights in the Work or copies thereof.
+a notice placed by the copyright holder saying it may be distributed
-
+under the terms of this General Public License.  The "Program", below,
-Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so.
+refers to any such program or work, and a "work based on the Program"
-
+means either the Program or any derivative work under copyright law:
-In the countries where moral rights apply, the Licensor waives his right to exercise his moral right to the extent allowed by law in order to make effective the licence of the economic rights here above listed.
+that is to say, a work containing the Program or a portion of it,
-
+either verbatim or with modifications and/or translated into another
-The Licensor grants to the Licensee royalty-free, non exclusive usage rights to any patents held by the Licensor, to the extent necessary to make use of the rights granted on the Work under this Licence.
+language.  (Hereinafter, translation is included without limitation in
-
+the term "modification".)  Each licensee is addressed as "you".
-3. Communication of the Source Code
+
-
+Activities other than copying, distribution and modification are not
-The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work along with each copy of the Work that the Licensor distributes or indicates, in a notice following the copyright notice attached to the Work, a repository where the Source Code is easily and freely accessible for as long as the Licensor continues to distribute and/or communicate the Work.
+covered by this License; they are outside its scope.  The act of
-
+running the Program is not restricted, and the output from the Program
-4. Limitations on copyright
+is covered only if its contents constitute a work based on the
-
+Program (independent of having been made by running the Program).
-Nothing in this Licence is intended to deprive the Licensee of the benefits from any exception or limitation to the exclusive rights of the rights owners in the Original Work or Software, of the exhaustion of those rights or of other applicable limitations thereto.
+Whether that is true depends on what the Program does.
-
+
-5. Obligations of the Licensee
+  1. You may copy and distribute verbatim copies of the Program's
-
+source code as you receive it, in any medium, provided that you
-The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those obligations are the following:
+conspicuously and appropriately publish on each copy an appropriate
-
+copyright notice and disclaimer of warranty; keep intact all the
-Attribution right: the Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to the Licence and to the disclaimer of warranties. The Licensee must include a copy of such notices and a copy of the Licence with every copy of the Work he/she distributes and/or communicates. The Licensee must cause any Derivative Work to carry prominent notices stating that the Work has been modified and the date of modification.
+notices that refer to this License and to the absence of any warranty;
-
+and give any other recipients of the Program a copy of this License
-Copyleft clause: If the Licensee distributes and/or communicates copies of the Original Works or Derivative Works based upon the Original Work, this Distribution and/or Communication will be done under the terms of this Licence or of a later version of this Licence unless the Original Work is expressly distributed only under this version of the Licence. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the Work or Derivative Work that alter or restrict the terms of the Licence.
+along with the Program.
-
+
-Compatibility clause: If the Licensee Distributes and/or Communicates Derivative Works or copies thereof based upon both the Original Work and another work  licensed under a Compatible Licence, this Distribution and/or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, "Compatible Licence" refers to the licences listed in the appendix attached to this Licence. Should the Licensee’s obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail.
+You may charge a fee for the physical act of transferring a copy, and
-
+you may at your option offer warranty protection in exchange for a fee.
-Provision of Source Code: When distributing and/or communicating copies of the Work, the Licensee will provide a machine-readable copy of the Source Code or indicate a repository where this Source will be easily and freely available for as long as the Licensee continues to distribute and/or communicate the Work.
+
-
+  2. You may modify your copy or copies of the Program or any portion
-Legal Protection: This Licence does not grant permission to use the trade names, trademarks, service marks, or names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the copyright notice.
+of it, thus forming a work based on the Program, and copy and
-
+distribute such modifications or work under the terms of Section 1
-6. Chain of Authorship
+above, provided that you also meet all of these conditions:
-
+
-The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence.
+    a) You must cause the modified files to carry prominent notices
-
+    stating that you changed the files and the date of any change.
-Each Contributor warrants that the copyright in the modifications he/she brings to the Work are owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence.
+
-
+    b) You must cause any work that you distribute or publish, that in
-Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the terms of this Licence.
+    whole or in part contains or is derived from the Program or any
-
+    part thereof, to be licensed as a whole at no charge to all third
-7. Disclaimer of Warranty
+    parties under the terms of this License.
-
+
-The Work is a work in progress, which is continuously improved by numerous contributors. It is not a finished work and may therefore contain defects or "bugs" inherent to this type of software development.
+    c) If the modified program normally reads commands interactively
-
+    when run, you must cause it, when started running for such
-For the above reason, the Work is provided under the Licence on an "as is" basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property rights other than copyright as stated in Article 6 of this Licence.
+    interactive use in the most ordinary way, to print or display an
-
+    announcement including an appropriate copyright notice and a
-This disclaimer of warranty is an essential part of the Licence and a condition for the grant of any rights to the Work.
+    notice that there is no warranty (or else, saying that you provide
-
+    a warranty) and that users may redistribute the program under
-8. Disclaimer of Liability
+    these conditions, and telling the user how to view a copy of this
-
+    License.  (Exception: if the Program itself is interactive but
-Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be liable for any direct or indirect, material or moral, damages of any kind, arising out of the Licence or of the use of the Work, including without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss of data or any commercial damage, even if the Licensor has been advised of the possibility of such damage. However, the Licensor will be liable under statutory product liability laws as far such laws apply to the Work.
+    does not normally print such an announcement, your work based on
-
+    the Program is not required to print an announcement.)
-9. Additional agreements
+
-
+These requirements apply to the modified work as a whole.  If
-While distributing the Original Work or Derivative Works, You may choose to conclude an additional agreement to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or services consistent with this Licence. However, in accepting such obligations, You may act only on your own behalf and on your sole responsibility, not on behalf of the original Licensor or any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against such Contributor by the fact You have accepted any such warranty or additional liability.
+identifiable sections of that work are not derived from the Program,
-
+and can be reasonably considered independent and separate works in
-10. Acceptance of the Licence
+themselves, then this License, and its terms, do not apply to those
-
+sections when you distribute them as separate works.  But when you
-The provisions of this Licence can be accepted by clicking on an icon "I agree" placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions.
+distribute the same sections as part of a whole which is a work based
-
+on the Program, the distribution of the whole must be on the terms of
-Similarly, you irrevocably accept this Licence and all of its terms and conditions by exercising any rights granted to You by Article 2 of this Licence, such as the use of the Work, the creation by You of a Derivative Work or the Distribution and/or Communication by You of the Work or copies thereof.
+this License, whose permissions for other licensees extend to the
-
+entire whole, and thus to each and every part regardless of who wrote it.
-11. Information to the public
+
-
+Thus, it is not the intent of this section to claim rights or contest
-In case of any Distribution and/or Communication of the Work by means of electronic communication by You (for example, by offering to download the Work from a remote location) the distribution channel or media (for example, a website) must at least provide to the public the information requested by the applicable law regarding the Licensor, the Licence and the way it may be accessible, concluded, stored and reproduced by the Licensee.
+your rights to work written entirely by you; rather, the intent is to
-
+exercise the right to control the distribution of derivative or
-12. Termination of the Licence
+collective works based on the Program.
-
+
-The Licence and the rights granted hereunder will terminate automatically upon any breach by the Licensee of the terms of the Licence.
+In addition, mere aggregation of another work not based on the Program
-
+with the Program (or with a work based on the Program) on a volume of
-Such a termination will not terminate the licences of any person who has received the Work from the Licensee under the Licence, provided such persons remain in full compliance with the Licence.
+a storage or distribution medium does not bring the other work under
-
+the scope of this License.
-13. Miscellaneous
+
-
+  3. You may copy and distribute the Program (or a work based on it,
-Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the Work licensed hereunder.
+under Section 2) in object code or executable form under the terms of
-
+Sections 1 and 2 above provided that you also do one of the following:
-If any provision of the Licence is invalid or unenforceable under applicable law, this will not affect the validity or enforceability of the Licence as a whole. Such provision will be construed and/or reformed so as necessary to make it valid and enforceable.
+
-
+    a) Accompany it with the complete corresponding machine-readable
-The European Commission may publish other linguistic versions and/or new versions of this Licence, so far this is required and reasonable, without reducing the scope of the rights granted by the Licence. New versions of the Licence will be published with a unique version number.
+    source code, which must be distributed under the terms of Sections
-
+    1 and 2 above on a medium customarily used for software interchange; or,
-All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of their choice.
+
-
+    b) Accompany it with a written offer, valid for at least three
-14. Jurisdiction
+    years, to give any third party, for a charge no more than your
-
+    cost of physically performing source distribution, a complete
-Any litigation resulting from the interpretation of this License, arising between the European Commission, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice of the European Communities, as laid down in article 238 of the Treaty establishing the European Community.
+    machine-readable copy of the corresponding source code, to be
-
+    distributed under the terms of Sections 1 and 2 above on a medium
-Any litigation arising between Parties, other than the European Commission, and resulting from the interpretation of this License, will be subject to the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business.
+    customarily used for software interchange; or,
-
+
-15. Applicable Law
+    c) Accompany it with the information you received as to the offer
-
+    to distribute corresponding source code.  (This alternative is
-This Licence shall be governed by the law of the European Union country where the Licensor resides or has his registered office.
+    allowed only for noncommercial distribution and only if you
-
+    received the program in object code or executable form with such
-This licence shall be governed by the Belgian law if:
+    an offer, in accord with Subsection b above.)
-
+
- a litigation arises between the European Commission, as a Licensor, and any Licensee;
+The source code for a work means the preferred form of the work for
- the Licensor, other than the European Commission, has no residence or registered office inside a European Union country.
+making modifications to it.  For an executable work, complete source
-
+code means all the source code for all modules it contains, plus any
-
+associated interface definition files, plus the scripts used to
-===
+control compilation and installation of the executable.  However, as a
-Appendix
+special exception, the source code distributed need not include
-
+anything that is normally distributed (in either source or binary
-"Compatible Licences" according to article 5 EUPL are:
+form) with the major components (compiler, kernel, and so on) of the
- GNU General Public License (GNU GPL) v. 2
+operating system on which the executable runs, unless that component
- Open Software License (OSL) v. 2.1, v. 3.0
+itself accompanies the executable.
- Common Public License v. 1.0
+
- Eclipse Public License v. 1.0
+If distribution of executable or object code is made by offering
- Cecill v. 2.0
+access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
 void, and will automatically terminate your rights under this License.
 However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Program (or any work based on the
 Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
  6. Each time you redistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Program at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Program.
 If any portion of this section is held invalid or unenforceable under
 any particular circumstance, the balance of the section is intended to
 apply and the section as a whole is intended to apply in other
 circumstances.
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system, which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
 to distribute software through any other system and a licensee cannot
 impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
 those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 Each version is given a distinguishing version number.  If the Program
 specifies a version number of this License which applies to it and "any
 later version", you have the option of following the terms and conditions
 either of that version or of any later version published by the Free
 Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
 Foundation.
  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
 make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
                            NO WARRANTY
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    {description}
    Copyright (C) {year}  {fullname}
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, the commands you use may
 be called something other than `show w' and `show c'; they could even be
 mouse-clicks or menu items--whatever suits your program.
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.
  {signature of Ty Coon}, 1 April 1989
  Ty Coon, President of Vice
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
@@ -1,175 +1,111 @@
-<p align="center">
+# Automated Install 
-<a href=https://www.bountysource.com/trackers/3011939-pi-hole-pi-hole?utm_source=3011939&utm_medium=shield&utm_campaign=TRACKER_BADGE><img src="https://www.bountysource.com/badge/tracker?tracker_id=3011939"></a>
+##### Designed For Raspberry Pi A+, B, B+, 2, Zero, and 3B (with an Ethernet/Wi-Fi adapter) (Works on most Debian distributions!)
 <a href="https://www.codacy.com/app/Pi-hole/pi-hole?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=pi-hole/pi-hole&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/c558a0f8d7124c99b02b84f0f5564238"/></a>
 <a href=https://travis-ci.org/pi-hole/pi-hole><img src="https://travis-ci.org/pi-hole/pi-hole.svg?branch=development"></a>
 </p>
 <p align="center">
 <a href=https://discourse.pi-hole.net><img src="https://assets.pi-hole.net/static/Vortex_text.png" width=210></a>
 </p>
-## The multi-platform, network-wide ad blocker
+[![Join the chat at https://gitter.im/pi-hole/pi-hole](https://badges.gitter.im/pi-hole/pi-hole.svg)](https://gitter.im/pi-hole/pi-hole?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-Block ads for **all** your devices _without_ the need to install client-side software.  The Pi-hole blocks ads at the DNS-level, so all your devices are protected.
+1. Install Raspbian 
- Web Browsers
+2. Run the command below
 - Cell Phones
 - Smart TV's
 - Internet-connected home automation
 - Anything that communicates with the Internet
-<p align="center">
+### ```curl -L https://install.pi-hole.net | bash```
 <a href=http://www.digitalocean.com/?refcode=344d234950e1><img src="https://assets.pi-hole.net/static/DOHostingSlug.png"></a>
 </p>
 ## Your Support Still Matters
 Digital Ocean helps with our infrastructure, but our developers are all volunteers so *your donations help keep us innovating*. Sending a donation using our links below helps us offset a portion of our monthly costs.
 -   ![Paypal](https://assets.pi-hole.net/static/paypal.png) [Donate via PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY)
 -   ![Bitcoin](https://assets.pi-hole.net/static/Bitcoin.png) Bitcoin Address: 1GKnevUnVaQM2pQieMyeHkpr8DXfkpfAtL
 ### One-Step Automated Install
 1.  Install a [supported operating system](https://discourse.pi-hole.net/t/hardware-software-requirements/273/1)
 2.  Run the command below (it downloads [this script](https://github.com/pi-hole/pi-hole/blob/master/automated%20install/basic-install.sh) in case you want to read over it first!)
 ### `curl -sSL https://install.pi-hole.net | bash`
 #### Alternative Semi-Automated Install Methods
 _If you wish to read over the script before running it, run `nano basic-install.sh` to open the file in a text viewer._
 ##### Clone our repository and run the automated installer from your device.
 #### Alternative Semi-Automated install ####
 ```
 git clone --depth 1 https://github.com/pi-hole/pi-hole.git Pi-hole
 cd Pi-hole/automated\ install/
 bash basic-install.sh
 ```
 ##### Or
 ```bash
 wget -O basic-install.sh https://install.pi-hole.net
-bash basic-install.sh
+chmod +x basic-install.sh
 ./basic-install.sh
 ```
-Once installed, [configure your router to have **DHCP clients use the Pi as their DNS server**](https://discourse.pi-hole.net/t/how-do-i-configure-my-devices-to-use-pi-hole-as-their-dns-server/245) and then any device that connects to your network will have ads blocked without any further configuration. Alternatively, you can manually set each device to use Pi-hole as their DNS server.
+Once installed, [configure your router to have **DHCP clients use the Pi as their DNS server**](http://pi-hole.net/faq/can-i-set-the-pi-hole-to-be-the-dns-server-at-my-router-so-i-dont-have-to-change-settings-for-my-devices/) and then any device that connects to your network will have ads blocked without any further configuration.  Alternatively, you can manually set each device to [use the Raspberry Pi as its DNS server](http://pi-hole.net/faq/how-do-i-use-the-pi-hole-as-my-dns-server/).
-## What is Pi-hole and how do I install it?
+## Pi-hole Is Free, But Powered By Your Donations
-<p align="center">
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "Free, but powered by donations")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")
 <a href=https://www.youtube.com/watch?v=vKWjx1AQYgs><img src="https://assets.pi-hole.net/static/video-explainer.png"></a>
 </p>
 ## Catch us out on the net:
 Twitter: [@The_Pi_Hole](https://twitter.com/The_Pi_Hole)
-## Get Help Or Connect With Us On The Web
+reddit: [/r/pihole](https://www.reddit.com/r/pihole/)
-   [Users Forum](https://discourse.pi-hole.net/)
+## How Does It Work?
-   [FAQs](https://discourse.pi-hole.net/c/faqs)
+**Watch the 60-second video below to get a quick overview**
-   [Wiki](https://github.com/pi-hole/pi-hole/wiki)
+
-   ![Twitter](https://assets.pi-hole.net/static/twitter.png) [Tweet @The_Pi_Hole](https://twitter.com/The_Pi_Hole)
+[![Pi-hole exlplained](http://i.imgur.com/qNybJDX.png)](https://vimeo.com/135965232)
-   ![Reddit](https://assets.pi-hole.net/static/reddit.png) [Reddit /r/pihole](https://www.reddit.com/r/pihole/)
+
-   ![YouTube](https://assets.pi-hole.net/static/youtube.png)  [Pi-hole channel](https://www.youtube.com/channel/UCT5kq9w0wSjogzJb81C9U0w)
+## Pi-hole Projects
-   [![Join the chat at https://gitter.im/pi-hole/pi-hole](https://badges.gitter.im/pi-hole/pi-hole.svg)](https://gitter.im/pi-hole/pi-hole?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+- [Pi-hole stats in your Mac's menu bar](https://getbitbar.com/plugins/Network/pi-hole.1m.py)
 - [Get LED alerts for each blocked ad](http://www.stinebaugh.info/get-led-alerts-for-each-blocked-ad-using-pi-hole/)
 - [Pi-hole on Ubuntu 14.04 on VirtualBox](http://hbalagtas.blogspot.com/2016/02/adblocking-with-pi-hole-and-ubuntu-1404.html)
 - [x86 Docker container that runs Pi-hole](https://hub.docker.com/r/diginc/pi-hole/)
 - [Splunk: Pi-hole Visualizser](https://splunkbase.splunk.com/app/3023/)
 - [Pi-hole Chrome extension](https://chrome.google.com/webstore/detail/pi-hole-list-editor/hlnoeoejkllgkjbnnnhfolapllcnaglh) ([open source](https://github.com/packtloss/pihole-extension))
 - [Go Bananas for CHiP-hole ad blocking](https://www.hackster.io/jacobsalmela/chip-hole-network-wide-ad-blocker-98e037)
 - [Sky-Hole](http://dlaa.me/blog/post/skyhole)
 - [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
 - [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
 - [Pi-hole on/off button](http://thetimmy.silvernight.org/pages/endisbutton/)
 - [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole)
 ## Coverage
 - [TekThing: 5 fun, easy projects for a Raspberry Pi](https://youtu.be/QwrKlyC2kdM?t=1m42s)
 - [Pi-hole on Adafruit's blog](https://blog.adafruit.com/2016/03/04/pi-hole-is-a-black-hole-for-internet-ads-piday-raspberrypi-raspberry_pi/)
 - [The Defrag Show - MSDN/Channel 9](https://channel9.msdn.com/Shows/The-Defrag-Show/Defrag-Endoscope-USB-Camera-The-Final-HoloLens-Vote-Adblock-Pi-and-more?WT.mc_id=dlvr_twitter_ch9#time=20m39s)
 - [MacObserver Podcast 585](http://www.macobserver.com/tmo/podcast/macgeekgab-585)
 - [Medium: Block All Ads For $53](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)
 - [MakeUseOf: Adblock Everywhere, The Pi-hole Way](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
 - [Lifehacker: Turn Your Pi Into An Ad Blocker With A Single Command](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
 - [Pi-hole on TekThing](https://youtu.be/8Co59HU2gY0?t=2m)
 - [Pi-hole on Security Now! Podcast](http://www.youtube.com/watch?v=p7-osq_y8i8&t=100m26s)
 - [Foolish Tech Show](https://youtu.be/bYyena0I9yc?t=2m4s)
 - [Pi-hole on Ubuntu](http://www.boyter.org/2015/12/pi-hole-ubuntu-14-04/)
 - [Catchpoint: iOS 9 Ad Blocking](http://blog.catchpoint.com/2015/09/14/ad-blocking-apple/)
 ## Partnering With Optimal.com
 Pi-hole will be teaming up with [Rob Leathern's subscription service to avoid ads](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d).  This service is unique and will help content-creators and publishers [still make money from visitors who are using an ad ablocker](http://techcrunch.com/2015/12/17/the-new-optimal/).
 ## Technical Details
-The Pi-hole is an **advertising-aware DNS/Web server**. If an ad domain is queried, a small Web page or GIF is delivered in place of the advertisement.
+The Pi-hole is an **advertising-aware DNS/Web server**.  If an ad domain is queried, a small Web page or GIF is delivered in place of the advertisement.  You can also [replace ads with any image you want](http://pi-hole.net/faq/is-it-possible-to-change-the-blank-page-that-takes-place-of-the-ads-to-something-else/) since it is just a simple Webpage taking place of the ads.
-### Gravity
+A more detailed explanation of the installation can be found [here](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0).
-The [gravity.sh](https://github.com/pi-hole/pi-hole/blob/master/gravity.sh) does most of the magic. The script pulls in ad domains from many sources and compiles them into a single list of [over 1.6 million entries](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0) (if you decide to use the [mahakala list](https://github.com/pi-hole/pi-hole/commit/963eacfe0537a7abddf30441c754c67ca1e40965)). This script is controlled by the `pihole` command. Please run `pihole -h` to see what commands can be run via `pihole`.
+## Gravity
 The [gravity.sh](https://github.com/pi-hole/pi-hole/blob/master/gravity.sh) does most of the magic.  The script pulls in ad domains from many sources and compiles them into a single list of [over 1.6 million entries](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0) (if you decide to use the [mahakala list](https://github.com/pi-hole/pi-hole/commit/963eacfe0537a7abddf30441c754c67ca1e40965)).
 ## Whitelist and blacklist
 Domains can be whitelisted and blacklisted using two pre-installed scripts. See [the wiki page](https://github.com/pi-hole/pi-hole/wiki/Whitelisting-and-Blacklisting) for more details
 ## Web Interface
 The [Web interface](https://github.com/jacobsalmela/AdminLTE#pi-hole-admin-dashboard) will be installed automatically so you can view stats and change settings.  You can find it at:
-#### Other Operating Systems
+`http://192.168.1.x/admin/index.php`
-The automated install is only for a clean install of a Debian family or Fedora based system, such as the Raspberry Pi. However, this script will work for most UNIX-like systems, some with some slight **modifications** that we can help you work through. If you can install `dnsmasq` and a Webserver, it should work OK. If there are other platforms you'd like supported, let us know.
+![Pi-hole Advanced Stats Dashboard](http://i.imgur.com/rTlLYPh.png)
-### Web Interface
+### API
 The [Web interface](https://github.com/pi-hole/AdminLTE#pi-hole-admin-dashboard) will be installed automatically so you can view stats and change settings. You can find it at:
 `http://192.168.1.x/admin/index.php` or `http://pi.hole/admin`
 ![Pi-hole Advanced Stats Dashboard](https://assets.pi-hole.net/static/dashboard212.png)
 ### Whitelist and blacklist
 Domains can be whitelisted and blacklisted using either the web interface or the command line. See [the wiki page](https://github.com/pi-hole/pi-hole/wiki/Whitelisting-and-Blacklisting) for more details
 <p align="center">
 <a href=https://github.com/pi-hole/pi-hole/wiki/Whitelisting-and-Blacklisting><img src="https://assets.pi-hole.net/static/whitelist212.png"></a>
 </p>
 ### Settings
 The settings page lets you control and configure your Pi-hole.  You can do things like:
 - enable Pi-hole's built-in DHCP server
 - exclude domains from the graphs
 - configure upstream DNS servers
 - and more!
 ![Settings page](https://assets.pi-hole.net/static/settings212.png)
 #### Built-in DHCP Server
 Pi-hole ships with a built-in DHCP server.  This allows you to let your network devices use Pi-hole as their DNS server if your router does not let you adjust the DHCP options.
 <p align="center">
 <a href=hhttps://discourse.pi-hole.net/t/how-do-i-configure-my-devices-to-use-pi-hole-as-their-dns-server/245><img src="https://assets.pi-hole.net/static/piholedhcpserver.png"></a>
 </p>
 ## API
 A basic read-only API can be accessed at `/admin/api.php`. It returns the following JSON:
-
+```JSON
 ``` json
 {
-    "domains_being_blocked": "136708",
+	"domains_being_blocked": "136708",
-    "dns_queries_today": "18108",
+	"dns_queries_today": "18108",
-    "ads_blocked_today": "14648",
+	"ads_blocked_today": "14648",
-    "ads_percentage_today": "80.89"
+	"ads_percentage_today": "80.89"
 }
 ```
 The same output can be acheived on the CLI by running `chronometer.sh -j`
-The same output can be achieved on the CLI by running `chronometer.sh -j`
+![Web](http://i.imgur.com/m114SCn.png)
 ## Real-time Statistics
-You can view [real-time stats](https://discourse.pi-hole.net/t/how-do-i-view-my-pi-holes-stats-over-ssh-or-on-an-lcd-using-chronometer/240) via `ssh` or on an [2.8" LCD screen](http://amzn.to/1P0q1Fj). This is accomplished via [`chronometer.sh`](https://github.com/pi-hole/pi-hole/blob/master/advanced/Scripts/chronometer.sh). ![Pi-hole LCD](http://i.imgur.com/nBEqycp.jpg)
+You can view [real-time stats](http://pi-hole.net/faq/install-the-real-time-lcd-monitor-chronometer/) via `ssh` or on an [2.8" LCD screen](http://amzn.to/1P0q1Fj).  This is accomplished via [`chronometer.sh`](https://github.com/pi-hole/pi-hole/blob/master/advanced/Scripts/chronometer.sh).
 ![Pi-hole LCD](http://i.imgur.com/nBEqycp.jpg)
-## Pi-hole Projects
+## Help
 - See the [Wiki](https://github.com/pi-hole/pi-hole/wiki/Customization) entry for more details
 - There is also an [FAQ section on pi-hole.net](http://pi-hole.net)
-   [An ad blocking Magic Mirror](https://zonksec.com/blog/magic-mirror-dns-filtering/#dnssoftware)
+## Other Operating Systems
-   [Pi-hole stats in your Mac's menu bar](https://getbitbar.com/plugins/Network/pi-hole.1m.py)
+This script will work for other UNIX-like systems with some slight **modifications**.  As long as you can install `dnsmasq` and a Webserver, it should work OK.  The automated install is only for a clean install of a Debian based system, such as the Raspberry Pi.
 -   [Get LED alerts for each blocked ad](http://thetimmy.silvernight.org/pages/endisbutton/)
 -   [Pi-hole on Ubuntu 14.04 on VirtualBox](http://hbalagtas.blogspot.com/2016/02/adblocking-with-pi-hole-and-ubuntu-1404.html)
 -   [Docker Pi-hole container (x86 and ARM)](https://hub.docker.com/r/diginc/pi-hole/)
 -   [Splunk: Pi-hole Visualizser](https://splunkbase.splunk.com/app/3023/)
 -   [Pi-hole Chrome extension](https://chrome.google.com/webstore/detail/pi-hole-list-editor/hlnoeoejkllgkjbnnnhfolapllcnaglh) ([open source](https://github.com/packtloss/pihole-extension))
 -   [Go Bananas for CHiP-hole ad blocking](https://www.hackster.io/jacobsalmela/chip-hole-network-wide-ad-blocker-98e037)
 -   [Sky-Hole](http://dlaa.me/blog/post/skyhole)
 -   [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
 -   [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
 -   [Pi-hole on/off button](http://thetimmy.silvernight.org/pages/endisbutton/)
 -   [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole)
 -   [Windows Tray Stat Application](https://github.com/goldbattle/copernicus)
 -   [Let your blink1 device blink when Pi-hole filters ads](https://gist.github.com/elpatron68/ec0b4c582e5abf604885ac1e068d233f)
 -   [Pi-Hole Prometheus exporter](https://github.com/nlamirault/pihole_exporter) : a [Prometheus](https://prometheus.io/) exporter for Pi-Hole
 -   [Pi-hole Droid - open source Android client](https://github.com/friimaind/pi-hole-droid)
 ## Coverage
 -   [Adafruit livestream install](https://www.youtube.com/watch?v=eg4u2j1HYlI)
 -   [TekThing: 5 fun, easy projects for a Raspberry Pi](https://youtu.be/QwrKlyC2kdM?t=1m42s)
 -   [Pi-hole on Adafruit's blog](https://blog.adafruit.com/2016/03/04/pi-hole-is-a-black-hole-for-internet-ads-piday-raspberrypi-raspberry_pi/)
 -   [The Defrag Show - MSDN/Channel 9](https://channel9.msdn.com/Shows/The-Defrag-Show/Defrag-Endoscope-USB-Camera-The-Final-HoloLens-Vote-Adblock-Pi-and-more?WT.mc_id=dlvr_twitter_ch9#time=20m39s)
 -   [MacObserver Podcast 585](http://www.macobserver.com/tmo/podcast/macgeekgab-585)
 -   [Medium: Block All Ads For $53](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)
 -   [MakeUseOf: Adblock Everywhere, The Pi-hole Way](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
 -   [Lifehacker: Turn Your Pi Into An Ad Blocker With A Single Command](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
 -   [Pi-hole on TekThing](https://youtu.be/8Co59HU2gY0?t=2m)
 -   [Pi-hole on Security Now! Podcast](http://www.youtube.com/watch?v=p7-osq_y8i8&t=100m26s)
 -   [Foolish Tech Show](https://youtu.be/bYyena0I9yc?t=2m4s)
 -   [Pi-hole on Ubuntu](http://www.boyter.org/2015/12/pi-hole-ubuntu-14-04/)
 -   [Catchpoint: iOS 9 Ad Blocking](http://blog.catchpoint.com/2015/09/14/ad-blocking-apple/)
 -   [Build an Ad-Blocker for less than 10$ with Orange-Pi](http://www.devacron.com/orangepi-zero-as-an-ad-block-server-with-pi-hole/)
@@ -1,7 +1,7 @@
-## Pi-hole ad-list default sources. Updated 29/10/2016 #########################
+## Pi-hole ad-list default sources. Updated 21/02/2016 #########################
 #                                                                              #
 #  To make changes to this file:                                               #
-#    1. run `cp /etc/pihole/adlists.default /etc/pihole/adlists.list`          #
+#    1. run `cp /etc/pihole/adlists.default /etc/pihole/adlists.list`           #
 #    2. run `nano /etc/pihole/adlists.list`                                    #
 #    3. Uncomment or comment any of the below lists                            #
 #                                                                              #
@@ -14,40 +14,40 @@
 https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
 # Other lists we consider safe:
-https://mirror1.malwaredomains.com/files/justdomains
+http://adblock.gjtech.net/?format=unix-hosts
 http://mirror1.malwaredomains.com/files/justdomains
 http://sysctl.org/cameleon/hosts
 https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
 https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
 https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
 # hosts-file.net list. Updated frequently, but has been known to block legitimate sites.
-https://hosts-file.net/ad_servers.txt
+http://hosts-file.net/ad_servers.txt
-# Mahakala list. Has been known to block legitimate domains including the entire .com range.
+# Mahakala list. Has been known to block legitimage domains including the entire .com range.
 # Warning: Due to the sheer size of this list, the web admin console will be unresponsive.
-#https://adblock.mahakala.is/
+#http://adblock.mahakala.is/
 # ADZHOSTS list. Has been known to block legitimate domains
-#http://pilotfiber.dl.sourceforge.net/project/adzhosts/HOSTS.txt
+#http://optimate.dl.sourceforge.net/project/adzhosts/HOSTS.txt
 # Windows 10 telemetry list
-#https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win10/spy.txt
+#https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/hostsBlockWindowsSpy.txt
 # Securemecca.com list - Also blocks "adult" sites (pornography/gambling etc)
 #http://securemecca.com/Downloads/hosts.txt
 # Quidsup's tracker list
-#https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt
+https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt
 # Block the BBC News website Breaking News banner
 #https://raw.githubusercontent.com/BreakingTheNews/BreakingTheNews.github.io/master/hosts
 # Untested Lists:
 #https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt
-#https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt
+#http://spam404bl.com/spam404scamlist.txt
 #http://malwaredomains.lehigh.edu/files/domains.txt
 # Following two lists should be used simultaneously: (readme https://github.com/notracking/hosts-blocklists/)
 #https://raw.github.com/notracking/hosts-blocklists/master/hostnames.txt
 #https://raw.github.com/notracking/hosts-blocklists/master/domains.txt
 # Combination of several host files on the internet (warning some facebook domains are also blocked but you can go to facebook.com). See https://github.com/mat1th/Dns-add-block for more information.
 #https://raw.githubusercontent.com/mat1th/Dns-add-block/master/hosts
@@ -9,34 +9,53 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-###############################################################################
+# If you want dnsmasq to read another file, as well as /etc/hosts, use
-#      FILE AUTOMATICALLY POPULATED BY PI-HOLE INSTALL/UPDATE PROCEDURE.      #
+# this.
 # ANY CHANGES MADE TO THIS FILE AFTER INSTALL WILL BE LOST ON THE NEXT UPDATE #
 #                                                                             #
 #        IF YOU WISH TO CHANGE THE UPSTREAM SERVERS, CHANGE THEM IN:          #
 #                      /etc/pihole/setupVars.conf                             #
 #                                                                             #
 #        ANY OTHER CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE           #
 #                        OR IN /etc/dnsmasq.conf                              #
 ###############################################################################
 addn-hosts=/etc/pihole/gravity.list
 addn-hosts=/etc/pihole/local.list
 # The following two options make you a better netizen, since they
 # tell dnsmasq to filter out queries which the public DNS cannot
 # answer, and which load the servers (especially the root servers)
 # unnecessarily. If you have a dial-on-demand link they also stop
 # these requests from bringing up the link unnecessarily.
 # Never forward plain names (without a dot or domain part)
 domain-needed
-
+# Never forward addresses in the non-routed address spaces.
 bogus-priv
 # If you don't want dnsmasq to read /etc/resolv.conf or any other
 # file, getting its servers from this file instead (see below), then
 # uncomment this.
 no-resolv
 # Add other name servers here, with domain specs if they are for
 # non-public domains.
 server=@DNS1@
 server=@DNS2@
 # If you want dnsmasq to listen for DHCP and DNS requests only on
 # specified interfaces (and the loopback) give the name of the
 # interface (eg eth0) here.
 interface=@INT@
 # Or which to listen on by address (remember to include 127.0.0.1 if
 # you use this.)
 listen-address=127.0.0.1
 # Set the cachesize here.
 cache-size=10000
 # For debugging purposes, log each DNS query as it passes through
 # dnsmasq.
 log-queries
 log-facility=/var/log/pihole.log
 # Normally responses which come from /etc/hosts and the DHCP lease
 # file have Time-To-Live set as zero, which conventionally means
 # do not cache further. If you are happy to trade lower load on the
 # server for potentially stale date, you can set a time-to-live (in
 # seconds) here.
 local-ttl=300
 # This allows it to continue functioning without being blocked by syslog, and allows syslog to use dnsmasq for DNS queries without risking deadlock
 log-async
@@ -0,0 +1,242 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Blacklists domains
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #rootcheck
 if [[ $EUID -eq 0 ]];then
 	echo "::: You are root."
 else
 	echo "::: sudo will be used."
 	# Check if it is actually installed
 	# If it isn't, exit because the install cannot complete
 	if [[ $(dpkg-query -s sudo) ]];then
 		export SUDO="sudo"
 	else
 		echo "::: Please install sudo or run this script as root."
 		exit 1
 	fi
 fi
 if [[ $# = 0 ]]; then
 	helpFunc
 fi
 #globals
 basename=pihole
 piholeDir=/etc/$basename
 adList=$piholeDir/gravity.list
 blacklist=$piholeDir/blacklist.txt
 reload=true
 addmode=true
 force=false
 verbose=true
 domList=()
 domToRemoveList=()
 piholeIPfile=/etc/pihole/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
 if [[ -f $piholeIPfile ]];then
    # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
    piholeIP=$(cat $piholeIPfile)
    #rm $piholeIPfile
 else
    # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
    piholeIPCIDR=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}')
    piholeIP=${piholeIPCIDR%/*}
 fi
 modifyHost=false
 # After setting defaults, check if there's local overrides
 if [[ -r $piholeDir/pihole.conf ]];then
    echo "::: Local calibration requested..."
        . $piholeDir/pihole.conf
 fi
 if [[ -f $piholeIPv6file ]];then
    # If the file exists, then the user previously chose to use IPv6 in the automated installer
    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 fi
 function helpFunc()
 {
 	echo "::: Immediately blacklists one or more domains in the hosts file"
 	echo ":::"
 	echo ":::"
 	echo "::: Usage: pihole -b domain1 [domain2 ...]"
 	echo "::: Options:"
 	echo ":::  -d, --delmode			Remove domains from the blacklist"
 	echo ":::  -nr, --noreload			Update blacklist without refreshing dnsmasq"
 	echo ":::  -f, --force				Force updating of the hosts files, even if there are no changes"
 	echo ":::  -q, --quiet				output is less verbose"
 	echo ":::  -h, --help				Show this help dialog"
 	echo ":::  -l, --list				Display your blacklisted domains"
 	exit 1
 }
 if [[ $# = 0 ]]; then
 	helpFunc
 fi
 function HandleOther(){
  #check validity of domain
 	validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
 	if [ -z "$validDomain" ]; then
 		echo "::: $1 is not a valid argument or domain name"
 	else
 	  domList=("${domList[@]}" $validDomain)
 	fi
 }
 function PopBlacklistFile(){
 	#check blacklist file exists, and if not, create it
 	if [[ ! -f $blacklist ]];then
  	  touch $blacklist
 	fi
 	for dom in "${domList[@]}"; do
 	  if "$addmode"; then
 	  	AddDomain "$dom"
 	  else
 	    RemoveDomain "$dom"
 	  fi
 	done
 }
 function AddDomain(){
 #| sed 's/\./\\./g'
 	bool=false
 	grep -Ex -q "$1" $blacklist || bool=true
 	if $bool; then
 	  #domain not found in the blacklist file, add it!
 	  if $verbose; then
 	  echo -n "::: Adding $1 to blacklist file..."
 	  fi
 		echo "$1" >> $blacklist
 		modifyHost=true
 		echo " done!"
 	else
 	if $verbose; then
 		echo "::: $1 already exists in $blacklist! No need to add"
 		fi
 	fi
 }
 function RemoveDomain(){
  bool=false
  grep -Ex -q "$1" $blacklist || bool=true
  if $bool; then
  	#Domain is not in the blacklist file, no need to Remove
  	if $verbose; then
  	echo "::: $1 is NOT blacklisted! No need to remove"
  	fi
  else
    #Domain is in the blacklist file, add to a temporary array
    if $verbose; then
    echo "::: Un-blacklisting $dom..."
    fi
    domToRemoveList=("${domToRemoveList[@]}" $1)
    modifyHost=true
  fi
 }
 function ModifyHostFile(){
 	 if $addmode; then
 	    #add domains to the hosts file
 	    if [[ -r $blacklist ]];then
 	      numberOf=$(cat $blacklist | sed '/^\s*$/d' | wc -l)
        plural=; [[ "$numberOf" != "1" ]] && plural=s
        echo ":::"
        echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
 	    	if [[ -n $piholeIPv6 ]];then
 				cat $blacklist | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
 	      	else
 				cat $blacklist | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
 	      	fi
 	  	fi
 	  else
 		echo ":::"
 	  	for dom in "${domToRemoveList[@]}"
 		do
 	      #we need to remove the domains from the blacklist file and the host file
 			echo "::: $dom"
 			echo -n ":::    removing from HOSTS file..."
 	      	echo "$dom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList
 	      	echo " done!"
 	      	echo -n ":::    removing from blackist.txt..."
 	      	echo "$dom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $blacklist
 	      	echo " done!"
 		done
 	fi
 }
 function Reload() {
 	# Reload hosts file
 	echo ":::"
 	echo -n "::: Refresh lists in dnsmasq..."
 	dnsmasqPid=$(pidof dnsmasq)
 	if [[ $dnsmasqPid ]]; then
 		# service already running - reload config
 		$SUDO killall -s HUP dnsmasq
 	else
 		# service not running, start it up
 		$SUDO service dnsmasq start
 	fi
 	echo " done!"
 }
 function DisplayBlist() {
 	verbose=false
 	echo -e " Displaying Gravity Affected Domains \n"
 	count=1
 	while IFS= read -r AD
 	do
 		echo "${count}: $AD"
 		count=$((count+1))
 	done < "$blacklist"
 }
 ###################################################
 for var in "$@"
 do
  case "$var" in
    "-nr"| "--noreload"  ) reload=false;;
    "-d" | "--delmode"   ) addmode=false;;
    "-f" | "--force"     ) force=true;;
    "-q" | "--quiet"     ) verbose=false;;
    "-h" | "--help"	     ) helpFunc;;
    "-l" | "--list"      ) DisplayBlist;;
    *                    ) HandleOther "$var";;
  esac
 done
 PopBlacklistFile
 if $modifyHost || $force; then
 	ModifyHostFile
 else
  if $verbose; then
 		echo "::: No changes need to be made"
 	fi
 	exit 1
 fi
 if $reload; then
 	Reload
 fi
@@ -1,41 +1,87 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Calculates stats and displays to an LCD
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation, either version 2 of the License, or
-
+# (at your option) any later version.
 #Functions##############################################################################################################
 piLog="/var/log/pihole.log"
 gravity="/etc/pihole/gravity.list"
-. /etc/pihole/setupVars.conf
+today=$(date "+%b %e")
-# Borrowed/modified from https://gist.github.com/cjus/1047794
+function CalcBlockedDomains(){
-function GetJSONValue {
+	CheckIPv6
-    retVal=$(echo $1 | sed 's/\\\\\//\//g' | \
+	if [ -e "$gravity" ]; then
-                       sed 's/[{}]//g' | \
+		#Are we IPV6 or IPV4?
-                       awk -v k="text" '{n=split($0,a,","); for (i=1; i<=n; i++) print a[i]}' | \
+		if [[ -n $piholeIPv6 ]];then
-                       sed 's/\"\:/\|/g' | \
+			#We are IPV6
-                       sed 's/[\,]/ /g' | \
+			blockedDomainsTotal=$(wc -l /etc/pihole/gravity.list | awk '{print $1/2}')
-                       sed 's/\"//g' | \
+		else
-                       grep -w $2)
+			#We are IPV4
-    echo ${retVal##*|}
+			blockedDomainsTotal=$(wc -l /etc/pihole/gravity.list | awk '{print $1}')
 		fi
 	else
 		blockedDomainsTotal="Err."
 	fi
 }
-outputJSON() {
+function CalcQueriesToday(){
-	json=$(curl -s -X GET http://127.0.0.1/admin/api.php?summaryRaw)
+	if [ -e "$piLog" ];then
-	echo ${json}
+		queriesToday=$(cat "$piLog" | grep "$today" | awk '/query/ {print $6}' | wc -l)
 	else
 		queriesToday="Err."
 	fi
 }
-normalChrono() {
+function CalcblockedToday(){
-	for (( ; ; )); do
+	if [ -e "$piLog" ] && [ -e "$gravity" ];then
 		blockedToday=$(cat $piLog | awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' | wc -l)
 	else
 		blockedToday="Err."
 	fi
 }
 function CalcPercentBlockedToday(){
 	if [ "$queriesToday" != "Err." ] && [ "$blockedToday" != "Err." ]; then
 		if [ "$queriesToday" != 0 ]; then #Fixes divide by zero error :)
 		 #scale 2 rounds the number down, so we'll do scale 4 and then trim the last 2 zeros
 			percentBlockedToday=$(echo "scale=4; $blockedToday/$queriesToday*100" | bc)
 			percentBlockedToday=$(sed 's/.\{2\}$//' <<< "$percentBlockedToday")
 		else
 			percentBlockedToday=0
 		fi
 	fi
 }
 function CheckIPv6(){
 	piholeIPv6file="/etc/pihole/.useIPv6"
 	if [[ -f $piholeIPv6file ]];then
 	    # If the file exists, then the user previously chose to use IPv6 in the automated installer
 	    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 	fi
 }
 function outputJSON(){
 	CalcQueriesToday
 	CalcblockedToday
 	CalcPercentBlockedToday
 	CalcBlockedDomains
 	printf '{"domains_being_blocked":"%s","dns_queries_today":"%s","ads_blocked_today":"%s","ads_percentage_today":"%s"}\n' "$blockedDomainsTotal" "$queriesToday" "$blockedToday" "$percentBlockedToday"
 }
 function normalChrono(){
 	for (( ; ; ))
 	do
 		clear
 		# Displays a colorful Pi-hole logo
 		echo " [0;1;35;95m_[0;1;31;91m__[0m [0;1;33;93m_[0m     [0;1;34;94m_[0m        [0;1;36;96m_[0m"
@@ -43,7 +89,7 @@ normalChrono() {
 		echo "[0;1;33;93m|[0m  [0;1;32;92m_[0;1;36;96m/[0m [0;1;34;94m|_[0;1;35;95m__[0;1;31;91m|[0m [0;1;33;93m'[0m [0;1;32;92m\/[0m [0;1;36;96m_[0m [0;1;34;94m\[0m [0;1;35;95m/[0m [0;1;31;91m-[0;1;33;93m_)[0m"
 		echo "[0;1;32;92m|_[0;1;36;96m|[0m [0;1;34;94m|_[0;1;35;95m|[0m   [0;1;33;93m|_[0;1;32;92m||[0;1;36;96m_\[0;1;34;94m__[0;1;35;95m_/[0;1;31;91m_\[0;1;33;93m__[0;1;32;92m_|[0m"
 		echo ""
-		echo "        ${IPV4_ADDRESS}"
+		echo "        $(ifconfig eth0 | awk '/inet addr/ {print $2}' | cut -d':' -f2)"
 		echo ""
 		uptime | cut -d' ' -f11-
 		#uptime -p	#Doesn't work on all versions of uptime
@@ -52,44 +98,51 @@ normalChrono() {
 		# Uncomment to continually read the log file and display the current domain being blocked
 		#tail -f /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ {if ($7 != "address" && $7 != "name" && $7 != "/etc/pihole/gravity.list") print $7; else;}'
-		json=$(curl -s -X GET http://127.0.0.1/admin/api.php?summaryRaw)
+		#uncomment next 4 lines to use original query count calculation
 		#today=$(date "+%b %e")
 		#todaysQueryCount=$(cat /var/log/pihole.log | grep "$today" | awk '/query/ {print $7}' | wc -l)
 		#todaysQueryCountV4=$(cat /var/log/pihole.log | grep "$today" | awk '/query/ && /\[A\]/ {print $7}' | wc -l)
 		#todaysQueryCountV6=$(cat /var/log/pihole.log | grep "$today" | awk '/query/ && /\[AAAA\]/ {print $7}' | wc -l)
    domains=$(printf "%'.f" $(GetJSONValue ${json} "domains_being_blocked")) #add commas in
    queries=$(printf "%'.f" $(GetJSONValue ${json} "dns_queries_today"))
    blocked=$(printf "%'.f" $(GetJSONValue ${json} "ads_blocked_today"))
    LC_NUMERIC=C percentage=$(printf "%0.2f\n" $(GetJSONValue ${json} "ads_percentage_today")) #2 decimal places
-		echo "Blocking:      ${domains}"
+		CalcQueriesToday
-		echo "Queries:       ${queries}"
+		CalcblockedToday
 		CalcPercentBlockedToday
-		echo "Pi-holed:      ${blocked} (${percentage}%)"
+		CalcBlockedDomains
 		echo "Blocking:      $blockedDomainsTotal"
 		#below commented line does not add up to todaysQueryCount
 		#echo "Queries:       $todaysQueryCountV4 / $todaysQueryCountV6"
 		echo "Queries:       $queriesToday" #same total calculation as dashboard
 	  echo "Pi-holed:      $blockedToday ($percentBlockedToday%)"
 		sleep 5
 	done
 }
-displayHelp() {
+function displayHelp(){
-	cat << EOM
+ 	echo "::: Displays stats about your piHole!"
-::: Displays stats about your piHole!
+    echo ":::"
-:::
+    echo "::: Usage: sudo pihole -c [optional:-j]"
-::: Usage: sudo pihole -c [optional:-j]
+    echo "::: Note: If no option is passed, then stats are displayed on screen, updated every 5 seconds"
-::: Note: If no option is passed, then stats are displayed on screen, updated every 5 seconds
+    echo ":::"
-:::
+    echo "::: Options:"
-::: Options:
+    echo ":::  -j, --json		output stats as JSON formatted string"
-:::  -j, --json		output stats as JSON formatted string
+    echo ":::  -h, --help		display this help text"
-:::  -h, --help		display this help text
+
-EOM
+    exit 1
    exit 0
 }
 if [[ $# = 0 ]]; then
 	normalChrono
 fi
-for var in "$@"; do
+for var in "$@"
-	case "$var" in
+do
-		"-j" | "--json"  ) outputJSON;;
+  case "$var" in
-		"-h" | "--help"  ) displayHelp;;
+    "-j" | "--json"  ) outputJSON;;
-		*                ) exit 1;;
+    "-h" | "--help"  ) displayHelp;;
-	esac
+    *                ) exit 1;;
  esac
 done
@@ -1,231 +0,0 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
 #
 # Whitelists and blacklists domains
 #
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 #globals
 basename=pihole
 piholeDir=/etc/${basename}
 whitelist=${piholeDir}/whitelist.txt
 blacklist=${piholeDir}/blacklist.txt
 readonly wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
 reload=false
 addmode=true
 verbose=true
 domList=()
 domToRemoveList=()
 listMain=""
 listAlt=""
 helpFunc() {
    if [[ ${listMain} == ${whitelist} ]]; then
        letter="w"
        word="white"
    else
        letter="b"
        word="black"
    fi
 	cat << EOM
 ::: Immediately ${word}lists one or more domains in the hosts file
 :::
 ::: 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
 EOM
 if [[ "${letter}" == "b" ]]; then
 	echo ":::  -wild, --wildcard        Add wildcard entry (only blacklist)"
 fi
 	exit 0
 }
 EscapeRegexp() {
    # This way we may safely insert an arbitrary
    # string in our regular expressions
    # Also remove leading "." if present
    echo $* | sed 's/^\.*//' | sed "s/[]\.|$(){}?+*^]/\\\\&/g" | sed "s/\\//\\\\\//g"
 }
 HandleOther(){
 	# First, convert everything to lowercase
 	domain=$(sed -e "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/" <<< "$1")
 	#check validity of domain
 	validDomain=$(echo "${domain}" | perl -lne 'print if /(?!.*[^a-z0-9-\.].*)^((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9-]+\.)*[a-z]{2,63}/')
 	if [ -z "${validDomain}" ]; then
 		echo "::: $1 is not a valid argument or domain name"
 	else
 		domList=("${domList[@]}" ${validDomain})
 	fi
 }
 PoplistFile() {
 	#check whitelist file exists, and if not, create it
 	if [[ ! -f ${whitelist} ]]; then
 		touch ${whitelist}
 	fi
 	for dom in "${domList[@]}"; do
 	    # Logic : If addmode then add to desired list and remove from the other; if delmode then remove from desired list but do not add to the other
 		if ${addmode}; then
 			AddDomain "${dom}" "${listMain}"
 			RemoveDomain "${dom}" "${listAlt}"
 		else
 			RemoveDomain "${dom}" "${listMain}"
 		fi
 	done
 }
 AddDomain() {
 	list="$2"
    domain=$(EscapeRegexp "$1")
    if [[ "${list}" == "${whitelist}" || "${list}" == "${blacklist}" ]]; then
 		bool=true
 		#Is the domain in the list we want to add it to?
 		grep -Ex -q "${domain}" "${list}" > /dev/null 2>&1 || bool=false
 		if [[ "${bool}" == false ]]; then
 		  #domain not found in the whitelist file, add it!
 		  if [[ "${verbose}" == true ]]; then
 			echo "::: Adding $1 to $list..."
 		  fi
 		  reload=true
 		  # Add it to the list we want to add it to
 		  echo "$1" >> "${list}"
 		else
 	        if [[ "${verbose}" == true ]]; then
 	            echo "::: ${1} already exists in ${list}, no need to add!"
 	        fi
 		fi
 	elif [[ "${list}" == "${wildcardlist}" ]]; then
 		source "${piholeDir}/setupVars.conf"
 		#Remove the /* from the end of the IPv4addr.
 		IPV4_ADDRESS=${IPV4_ADDRESS%/*}
 		IPV6_ADDRESS=${IPV6_ADDRESS}
 		bool=true
 		#Is the domain in the list?
 		grep -e "address=\/${domain}\/" "${wildcardlist}" > /dev/null 2>&1 || bool=false
 		if [[ "${bool}" == false ]]; then
 		  if [[ "${verbose}" == true ]]; then
 			echo "::: Adding $1 to wildcard blacklist..."
 		  fi
 		  reload=true
 		  echo "address=/$1/${IPV4_ADDRESS}" >> "${wildcardlist}"
 		  if [[ ${#IPV6_ADDRESS} > 0 ]] ; then
 		    echo "address=/$1/${IPV6_ADDRESS}" >> "${wildcardlist}"
 		  fi
 		else
 	        if [[ "${verbose}" == true ]]; then
 	            echo "::: ${1} already exists in wildcard blacklist, no need to add!"
 	        fi
 		fi
 	fi
 }
 RemoveDomain() {
    list="$2"
    domain=$(EscapeRegexp "$1")
    if [[ "${list}" == "${whitelist}" || "${list}" == "${blacklist}" ]]; then
        bool=true
        #Is it in the list? Logic follows that if its whitelisted it should not be blacklisted and vice versa
        grep -Ex -q "${domain}" "${list}" > /dev/null 2>&1 || bool=false
        if [[ "${bool}" == true ]]; then
            # Remove it from the other one
            echo "::: Removing $1 from $list..."
            # /I flag: search case-insensitive
            sed -i "/${domain}/Id" "${list}"
            reload=true
        else
            if [[ "${verbose}" == true ]]; then
                echo "::: ${1} does not exist in ${list}, no need to remove!"
            fi
        fi
    elif [[ "${list}" == "${wildcardlist}" ]]; then
        bool=true
        #Is it in the list?
        grep -e "address=\/${domain}\/" "${wildcardlist}" > /dev/null 2>&1 || bool=false
        if [[ "${bool}" == true ]]; then
            # Remove it from the other one
            echo "::: Removing $1 from $list..."
            # /I flag: search case-insensitive
            sed -i "/address=\/${domain}/Id" "${list}"
            reload=true
        else
            if [[ "${verbose}" == true ]]; then
                echo "::: ${1} does not exist in ${list}, no need to remove!"
            fi
        fi
    fi
 }
 Reload() {
 	# Reload hosts file
 	pihole -g -sd
 }
 Displaylist() {
    if [[ ${listMain} == ${whitelist} ]]; then
        string="gravity resistant domains"
    else
        string="domains caught in the sinkhole"
    fi
 	verbose=false
 	echo -e " Displaying $string \n"
 	count=1
 	while IFS= read -r RD; do
 		echo "${count}: ${RD}"
 		count=$((count+1))
 	done < "${listMain}"
 	exit 0;
 }
 for var in "$@"; do
 	case "${var}" in
 	    "-w" | "whitelist"   ) listMain="${whitelist}"; listAlt="${blacklist}";;
 	    "-b" | "blacklist"   ) listMain="${blacklist}"; listAlt="${whitelist}";;
 		"-wild" | "wildcard" ) listMain="${wildcardlist}";;
 		"-nr"| "--noreload"  ) reload=false;;
 		"-d" | "--delmode"   ) addmode=false;;
 		"-f" | "--force"     ) force=true;;
 		"-q" | "--quiet"     ) verbose=false;;
 		"-h" | "--help"      ) helpFunc;;
 		"-l" | "--list"      ) Displaylist;;
 		*                    ) HandleOther "${var}";;
 	esac
 done
 shift
 if [[ $# = 0 ]]; then
 	helpFunc
 fi
 PoplistFile
 if ${reload}; then
 	Reload
 fi
@@ -1,444 +1,338 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Generates pihole_debug.log in /var/log/ to be used for troubleshooting.
 #
-# Generates pihole_debug.log to be used for troubleshooting.
+# Pi-hole is free software: you can redistribute it and/or modify
-#
+# it under the terms of the GNU General Public License as published by
-# This file is copyright under the latest version of the EUPL.
+# the Free Software Foundation, either version 2 of the License, or
-# Please see LICENSE file for your rights under this license.
+# (at your option) any later version.
-
+# Nate Brandeburg
-
+# nate@ubiquisoft.com
-set -o pipefail
+# 3/24/2016
 ######## GLOBAL VARS ########
 VARSFILE="/etc/pihole/setupVars.conf"
 DEBUG_LOG="/var/log/pihole_debug.log"
 DNSMASQFILE="/etc/dnsmasq.conf"
-DNSMASQCONFDIR="/etc/dnsmasq.d/*"
+PIHOLECONFFILE="/etc/dnsmasq.d/01-pihole.conf"
 LIGHTTPDFILE="/etc/lighttpd/lighttpd.conf"
 LIGHTTPDERRFILE="/var/log/lighttpd/error.log"
 GRAVITYFILE="/etc/pihole/gravity.list"
 HOSTSFILE="/etc/hosts"
 WHITELISTFILE="/etc/pihole/whitelist.txt"
 BLACKLISTFILE="/etc/pihole/blacklist.txt"
-ADLISTFILE="/etc/pihole/adlists.list"
+ADLISTSFILE="/etc/pihole/adlists.list"
 PIHOLELOG="/var/log/pihole.log"
 WHITELISTMATCHES="/tmp/whitelistmatches.list"
-TIMEOUT=60
+
-# Header info and introduction
+######## FIRST CHECK ########
-cat << EOM
+# Must be root to debug
-::: Beginning Pi-hole debug at $(date)!
+if [[ $EUID -eq 0 ]]; then
-:::
+	echo "::: You are root... Beginning debug!"
-::: This process collects information from your Pi-hole, and optionally uploads
+else
-::: it to a unique and random directory on tricorder.pi-hole.net.
+	echo "::: Sudo will be used for debugging."
-:::
+	# Check if sudo is actually installed
-::: NOTE: All log files auto-delete after 48 hours and ONLY the Pi-hole developers
+	if [[ $(dpkg-query -s sudo) ]]; then
-::: can access your data via the given token. We have taken these extra steps to
+		export SUDO="sudo"
-::: secure your data and will work to further reduce any personal information gathered.
+	else
-:::
+		echo "::: Please install sudo or run this as root."
-::: Please read and note any issues, and follow any directions advised during this process.
+		exit 1
-EOM
+	fi
 fi
 # Ensure the file exists, create if not, clear if exists.
-truncate --size=0 "${DEBUG_LOG}"
+if [ ! -f "$DEBUG_LOG" ]; then
-chmod 644 ${DEBUG_LOG}
+	$SUDO touch $DEBUG_LOG
-chown "$USER":pihole ${DEBUG_LOG}
+	$SUDO chmod 644 $DEBUG_LOG
-
+	$SUDO chown "$USER":root $DEBUG_LOG
-source ${VARSFILE}
+else 
 	truncate -s 0 $DEBUG_LOG
 fi
 ### Private functions exist here ###
-log_write() {
+function versionCheck {
-    echo "${1}" >> "${DEBUG_LOG}"
+	echo "#######################################" >> $DEBUG_LOG
 	echo "########## Versions Section ###########" >> $DEBUG_LOG
 	echo "#######################################" >> $DEBUG_LOG
 	TMP=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
 	echo "Pi-hole Version: $TMP" >> $DEBUG_LOG
 	TMP=$(cd /var/www/html/admin && git describe --tags --abbrev=0)
 	echo "WebUI Version: $TMP" >> $DEBUG_LOG
 	echo >> $DEBUG_LOG
 }
-log_echo() {
+function compareWhitelist {
-  case ${1} in
+	if [ ! -f "$WHITELISTMATCHES" ]; then
-    -n)
+		$SUDO touch $WHITELISTMATCHES
-      echo -n ":::       ${2}"
+		$SUDO chmod 644 $WHITELISTMATCHES
-      log_write "${2}"
+		$SUDO chown "$USER":root $WHITELISTMATCHES
-      ;;
+	else
-    -r)
+		truncate -s 0 $WHITELISTMATCHES
-      echo ":::       ${2}"
+	fi
-      log_write "${2}"
+
-      ;;
+	echo "#######################################" >> $DEBUG_LOG
-    -l)
+	echo "######## Whitelist Comparison #########" >> $DEBUG_LOG
-      echo "${2}"
+	echo "#######################################" >> $DEBUG_LOG
-      log_write "${2}"
+	while read -r line; do
-      ;;
+		TMP=$(grep -w ".* $line$" "$GRAVITYFILE")
-     *)
+		if [ ! -z "$TMP" ]; then
-      echo ":::  ${1}"
+			echo "$TMP" >> $DEBUG_LOG
-      log_write "${1}"
+			echo "$TMP"	>> $WHITELISTMATCHES
-  esac
+		fi
 	done < "$WHITELISTFILE"
 	echo >> $DEBUG_LOG
 }
-header_write() {
+function compareBlacklist {
-  log_echo ""
+	echo "#######################################" >> $DEBUG_LOG
-  log_echo "${1}"
+	echo "######## Blacklist Comparison #########" >> $DEBUG_LOG
-  log_write ""
+	echo "#######################################" >> $DEBUG_LOG
 	while read -r line; do
 		if [ ! -z "$line" ]; then
 			grep -w ".* $line$" "$GRAVITYFILE" >> $DEBUG_LOG
 		fi
 	done < "$BLACKLISTFILE"
 	echo >> $DEBUG_LOG
 }
-file_parse() {
+function testNslookup {
    while read -r line; do
 		  if [ ! -z "${line}" ]; then
 			  [[ "${line}" =~ ^#.*$  || ! "${line}" ]] && continue
 				log_write "${line}"
 			fi
 		done < "${1}"
 		log_write ""
 }
 block_parse() {
  log_write "${1}"
 }
 lsof_parse() {
  local user
  local process
  user=$(echo ${1} | cut -f 3 -d ' ' | cut -c 2-)
  process=$(echo ${1} | cut -f 2 -d ' ' | cut -c 2-)
  [[ ${2} -eq ${process} ]] \
  && echo ":::       Correctly configured." \
  || log_echo ":::       Failure: Incorrectly configured daemon."
  log_write "Found user ${user} with process ${process}"
 }
 version_check() {
  header_write "Detecting Installed Package Versions:"
  local error_found
  error_found=0
 	local pi_hole_ver="$(cd /etc/.pihole/ && git describe --tags --abbrev=0)" \
 	&& log_echo -r "Pi-hole: $pi_hole_ver" || (log_echo "Pi-hole git repository not detected." && error_found=1)
 	local admin_ver="$(cd /var/www/html/admin && git describe --tags --abbrev=0)" \
 	&& log_echo -r "WebUI: $admin_ver" || (log_echo "Pi-hole Admin Pages git repository not detected." && error_found=1)
 	local light_ver="$(lighttpd -v |& head -n1 | cut -d " " -f1)" \
 	&& log_echo -r "${light_ver}" || (log_echo "lighttpd not installed." && error_found=1)
 	local php_ver="$(php -v |& head -n1)" \
 	&& log_echo -r "${php_ver}" || (log_echo "PHP not installed." && error_found=1)
 	(local pi_hole_branch="$(cd /etc/.pihole/ && git rev-parse --abbrev-ref HEAD)" && log_echo -r "Pi-hole branch:  ${pi_hole_branch}") || log_echo "Unable to obtain Pi-hole branch"
 	(local pi_hole_rev="$(cd /etc/.pihole/ && git describe --long --dirty --tags)" && log_echo -r "Pi-hole rev:     ${pi_hole_rev}") || log_echo "Unable to obtain Pi-hole revision"
 	(local admin_branch="$(cd /var/www/html/admin && git rev-parse --abbrev-ref HEAD)" && log_echo -r "AdminLTE branch: ${admin_branch}") || log_echo "Unable to obtain AdminLTE branch"
 	(local admin_rev="$(cd /var/www/html/admin && git describe --long --dirty --tags)" && log_echo -r "AdminLTE rev:    ${admin_rev}") || log_echo "Unable to obtain AdminLTE revision"
 	return "${error_found}"
 }
 dir_check() {
  header_write "Detecting contents of ${1}:"
  for file in $1*; do
    header_write "File ${file} found"
    echo -n ":::       Parsing..."
    file_parse "${file}"
    echo "done"
  done
  echo ":::"
 }
 files_check() {
  #Check non-zero length existence of ${1}
  header_write "Detecting existence of ${1}:"
  local search_file="${1}"
  if [[ -s ${search_file} ]]; then
     echo -n ":::       File exists, parsing..."
     file_parse "${search_file}"
     echo "done"
     return 0
  else
    log_echo "${1} not found!"
    return 1
  fi
  echo ":::"
 }
 source_file() {
  local file_found=$(files_check "${1}") \
   && (source "${1}" &> /dev/null && echo "${file_found} and was successfully sourced") \
   || log_echo -l "${file_found} and could not be sourced"
 }
 distro_check() {
  local soft_fail
  header_write "Detecting installed OS Distribution"
  soft_fail=0
 	local distro="$(cat /etc/*release)" && block_parse "${distro}" || (log_echo "Distribution details not found." && soft_fail=1)
 	return "${soft_fail}"
 }
 processor_check() {
  header_write "Checking processor variety"
  log_write $(uname -m) && return 0 || return 1
 }
 ipv6_check() {
  # Check if system is IPv6 enabled, for use in other functions
  if [[ $IPV6_ADDRESS ]]; then
    ls /proc/net/if_inet6 &>/dev/null
    return 0
  else
    return 1
  fi
 }
 ip_check() {
  local protocol=${1}
  local gravity=${2}
  local ip_addr_list="$(ip -${protocol} addr show dev ${PIHOLE_INTERFACE} | awk -F ' ' '{ for(i=1;i<=NF;i++) if ($i ~ '/^inet/') print $(i+1) }')"
  if [[ -n ${ip_addr_list} ]]; then
    log_write "IPv${protocol} on ${PIHOLE_INTERFACE}"
    log_write "Gravity configured for: ${2:-NOT CONFIGURED}"
    log_write "----"
    log_write "${ip_addr_list}"
    echo ":::       IPv${protocol} addresses located on ${PIHOLE_INTERFACE}"
    ip_ping_check ${protocol}
    return $(( 0 + $? ))
  else
    log_echo "No IPv${protocol} found on ${PIHOLE_INTERFACE}"
    return 1
  fi
 }
 ip_ping_check() {
  local protocol=${1}
  local cmd
  if [[ ${protocol} == "6" ]]; then
    cmd="ping6"
    g_addr="2001:4860:4860::8888"
  else
    cmd="ping"
    g_addr="8.8.8.8"
  fi
  local ip_def_gateway=$(ip -${protocol} route | grep default | cut -d ' ' -f 3)
  if [[ -n ${ip_def_gateway} ]]; then
    echo -n ":::        Pinging default IPv${protocol} gateway: "
    if ! ping_gateway="$(${cmd} -q -W 3 -c 3 -n ${ip_def_gateway} -I ${PIHOLE_INTERFACE} | tail -n 3)"; then
     echo "Gateway did not respond."
     return 1
    else
      echo "Gateway responded."
      log_write "${ping_gateway}"
    fi
    echo -n ":::        Pinging Internet via IPv${protocol}: "
    if ! ping_inet="$(${cmd} -q -W 3 -c 3 -n ${g_addr} -I ${PIHOLE_INTERFACE} | tail -n 3)"; then
      echo "Query did not respond."
      return 1
    else
      echo "Query responded."
      log_write "${ping_inet}"
    fi
  else
    log_echo "        No gateway detected."
  fi
  return 0
 }
 port_check() {
  local lsof_value
  lsof_value=$(lsof -i ${1}:${2} -FcL | tr '\n' ' ') \
  && lsof_parse "${lsof_value}" "${3}" \
  || log_echo "Failure: IPv${1} Port not in use"
 }
 daemon_check() {
  # Check for daemon ${1} on port ${2}
 	header_write "Daemon Process Information"
 	echo ":::     Checking ${2} port for ${1} listener."
 	if [[ ${IPV6_READY} ]]; then
 	  port_check 6 "${2}" "${1}"
  fi
 	lsof_value=$(lsof -i 4:${2} -FcL | tr '\n' ' ') \
    port_check 4 "${2}" "${1}"
 }
 testResolver() {
 	header_write "Resolver Functions Check"
 	# Find a blocked url that has not been whitelisted.
 	TESTURL="doubleclick.com"
-	if [ -s "${WHITELISTMATCHES}" ]; then
+	echo "#######################################" >> $DEBUG_LOG
 	echo "############ NSLookup Test ############" >> $DEBUG_LOG
 	echo "#######################################" >> $DEBUG_LOG
 	# Find a blocked url that has not been whitelisted.
 	if [ -s "$WHITELISTMATCHES" ]; then
 		while read -r line; do
 			CUTURL=${line#*" "}
-			if [ "${CUTURL}" != "Pi-Hole.IsWorking.OK" ]; then
+			if [ "$CUTURL" != "Pi-Hole.IsWorking.OK" ]; then
 				while read -r line2; do
 					CUTURL2=${line2#*" "}
-					if [ "${CUTURL}" != "${CUTURL2}" ]; then
+					if [ "$CUTURL" != "$CUTURL2" ]; then
-						TESTURL="${CUTURL}"
+						TESTURL="$CUTURL"
 						break 2
 					fi
-				done < "${WHITELISTMATCHES}"
+				done < "$WHITELISTMATCHES"
 			fi
-		done < "${GRAVITYFILE}"
+		done < "$GRAVITYFILE"
 	fi
-	log_write "Resolution of ${TESTURL} from Pi-hole:"
+	echo "NSLOOKUP of $TESTURL from PiHole:" >> $DEBUG_LOG
-	LOCALDIG=$(dig "${TESTURL}" @127.0.0.1)
+	nslookup "$TESTURL" >> $DEBUG_LOG
-	if [[ $? = 0 ]]; then
+	echo >> $DEBUG_LOG
-		log_write "${LOCALDIG}"
+	echo "NSLOOKUP of $TESTURL from 8.8.8.8:" >> $DEBUG_LOG
-	else
+	nslookup "$TESTURL" 8.8.8.8 >> $DEBUG_LOG
-		log_write "Failed to resolve ${TESTURL} on Pi-hole"
+	echo >> $DEBUG_LOG
 	fi
 	log_write ""
 	log_write "Resolution of ${TESTURL} from 8.8.8.8:"
 	REMOTEDIG=$(dig "${TESTURL}" @8.8.8.8)
 	if [[ $? = 0 ]]; then
 		log_write "${REMOTEDIG}"
 	else
 		log_write "Failed to resolve ${TESTURL} on 8.8.8.8"
 	fi
 	log_write ""
 	log_write "Pi-hole dnsmasq specific records lookups"
 	log_write "Cache Size:"
 	dig +short chaos txt cachesize.bind >> ${DEBUG_LOG}
 	log_write "Upstream Servers:"
 	dig +short chaos txt servers.bind >> ${DEBUG_LOG}
 	log_write ""
 }
-checkProcesses() {
+function checkProcesses {
-	header_write "Processes Check"
+	echo "#######################################" >> $DEBUG_LOG
-
+	echo "########### Processes Check ###########" >> $DEBUG_LOG
-	echo ":::     Logging status of lighttpd and dnsmasq..."
+	echo "#######################################" >> $DEBUG_LOG
 	echo ":::"
 	echo "::: Logging status of lighttpd and dnsmasq..."
 	PROCESSES=( lighttpd dnsmasq )
-	for i in "${PROCESSES[@]}"; do
+	for i in "${PROCESSES[@]}"
-		log_write ""
+	do
-		log_write "${i}"
+		echo "" >> $DEBUG_LOG
-		log_write " processes status:"
+		echo -n "$i" >> "$DEBUG_LOG"
-		systemctl -l status "${i}" >> "${DEBUG_LOG}"
+		echo " processes status:" >> $DEBUG_LOG
 		$SUDO systemctl -l status "$i" >> "$DEBUG_LOG"
 	done
 	log_write ""
 }
-debugLighttpd() {
+function debugLighttpd {
-  echo ":::     Checking for necessary lighttpd files."
+	echo "::: Writing lighttpd to debug log..."
-  files_check "${LIGHTTPDFILE}"
+	echo "#######################################" >> $DEBUG_LOG
-  files_check "${LIGHTTPDERRFILE}"
+	echo "############ lighttpd.conf ############" >> $DEBUG_LOG
-  echo ":::"
+	echo "#######################################" >> $DEBUG_LOG
 	if [ -e "$LIGHTTPDFILE" ]
 	then
 		while read -r line; do
 			if [ ! -z "$line" ]; then
 				[[ "$line" =~ ^#.*$ ]] && continue
 				echo "$line" >> $DEBUG_LOG
 			fi
 		done < "$LIGHTTPDFILE"
 		echo >> $DEBUG_LOG
 	else
 		echo "No lighttpd.conf file found!" >> $DEBUG_LOG
 		printf ":::\tNo lighttpd.conf file found\n"
 	fi
 	if [ -e "$LIGHTTPDERRFILE" ]
 	then
 		echo "#######################################" >> $DEBUG_LOG
 		echo "######### lighttpd error.log ##########" >> $DEBUG_LOG
 		echo "#######################################" >> $DEBUG_LOG
 		cat "$LIGHTTPDERRFILE" >> $DEBUG_LOG
 	else
 		echo "No lighttpd error.log file found!" >> $DEBUG_LOG
 		printf ":::\tNo lighttpd error.log file found\n"
 	fi
 	echo >> $DEBUG_LOG
 }
 countdown() {
  local tuvix
  tuvix=${TIMEOUT}
  printf "::: Logging will automatically teminate in %s seconds\n" "${TIMEOUT}"
  while [ $tuvix -ge 1 ]
  do
    printf ":::\t%s seconds left. " "${tuvix}"
    if [[ -z "${WEBCALL}" ]]; then
      printf "\r"
    else
      printf "\n"
    fi
    sleep 5
    tuvix=$(( tuvix - 5 ))
  done
 }
 ### END FUNCTIONS ###
-# Gather version of required packages / repositories
+### Check Pi internet connections ###
-version_check || echo "REQUIRED FILES MISSING"
+# Log the IP addresses of this Pi
-# Check for newer setupVars storage file
+IPADDR=$($SUDO ifconfig | perl -nle 's/dr:(\S+)/print $1/e')
-source_file "/etc/pihole/setupVars.conf"
+echo "::: Writing local IPs to debug log"
-# Gather information about the running distribution
+echo "IP Addresses of this Pi:" >> $DEBUG_LOG
-distro_check || echo "Distro Check soft fail"
+echo "$IPADDR" >> $DEBUG_LOG
-# Gather processor type
+echo >> $DEBUG_LOG
 processor_check || echo "Processor Check soft fail"
-ip_check 6 ${IPV6_ADDRESS}
+# Check if we can connect to the local gateway
-ip_check 4 ${IPV4_ADDRESS}
+GATEWAY_CHECK=$(ping -q -w 1 -c 1 "$(ip r | grep default | cut -d ' ' -f 3)" > /dev/null && echo ok || echo error)
 echo "Gateway check:" >> $DEBUG_LOG
 echo "$GATEWAY_CHECK" >> $DEBUG_LOG
 echo >> $DEBUG_LOG
-daemon_check lighttpd http
+versionCheck
-daemon_check dnsmasq domain
+compareWhitelist
 compareBlacklist
 testNslookup
 checkProcesses
 testResolver
 debugLighttpd
-files_check "${DNSMASQFILE}"
+echo "::: Writing dnsmasq.conf to debug log..."
-dir_check "${DNSMASQCONFDIR}"
+echo "#######################################" >> $DEBUG_LOG
-files_check "${WHITELISTFILE}"
+echo "############### Dnsmasq ###############" >> $DEBUG_LOG
-files_check "${BLACKLISTFILE}"
+echo "#######################################" >> $DEBUG_LOG
-files_check "${ADLISTFILE}"
+if [ -e "$DNSMASQFILE" ]
 then
 	#cat $DNSMASQFILE >> $DEBUG_LOG
 	while read -r line; do
 		if [ ! -z "$line" ]; then
 			[[ "$line" =~ ^#.*$ ]] && continue
 			echo "$line" >> $DEBUG_LOG
        fi
 	done < "$DNSMASQFILE"
 	echo >> $DEBUG_LOG
 else
 	echo "No dnsmasq.conf file found!" >> $DEBUG_LOG
 	printf ":::\tNo dnsmasq.conf file found!\n"
 fi
 echo "::: Writing 01-pihole.conf to debug log..."
 echo "#######################################" >> $DEBUG_LOG
 echo "########### 01-pihole.conf ############" >> $DEBUG_LOG
 echo "#######################################" >> $DEBUG_LOG
 if [ -e "$PIHOLECONFFILE" ]
 then
 	while read -r line; do
 		if [ ! -z "$line" ]; then
 			[[ "$line" =~ ^#.*$ ]] && continue
 			echo "$line" >> $DEBUG_LOG
        fi
 	done < "$PIHOLECONFFILE"
 	echo >> $DEBUG_LOG
 else
 	echo "No 01-pihole.conf file found!" >> $DEBUG_LOG
 	printf ":::\tNo 01-pihole.conf file found\n"
 fi
-header_write "Analyzing gravity.list"
+echo "::: Writing size of gravity.list to debug log..."
 echo "#######################################" >> $DEBUG_LOG
 echo "############ gravity.list #############" >> $DEBUG_LOG
 echo "#######################################" >> $DEBUG_LOG
 if [ -e "$GRAVITYFILE" ]
 then
 	wc -l "$GRAVITYFILE" >> $DEBUG_LOG
 	echo >> $DEBUG_LOG
 else
 	echo "No gravity.list file found!" >> $DEBUG_LOG
 	printf ":::\tNo gravity.list file found\n"
 fi
-	gravity_length=$(grep -c ^ "${GRAVITYFILE}") \
+# Write the hostname output to compare against entries in /etc/hosts, which is logged next
-	&& log_write "${GRAVITYFILE} is ${gravity_length} lines long." \
+echo "Hostname of this pihole is: " >> $DEBUG_LOG
-	|| log_echo "Warning: No gravity.list file found!"
+hostname >> $DEBUG_LOG
-header_write "Analyzing pihole.log"
+echo "::: Writing hosts file to debug log..."
 echo "#######################################" >> $DEBUG_LOG
 echo "################ Hosts ################" >> $DEBUG_LOG
 echo "#######################################" >> $DEBUG_LOG
 if [ -e "$HOSTSFILE" ]
 then
 	cat "$HOSTSFILE" >> $DEBUG_LOG
 	echo >> $DEBUG_LOG
 else
 	echo "No hosts file found!" >> $DEBUG_LOG
 	printf ":::\tNo hosts file found!\n"
 fi
-  pihole_length=$(grep -c ^ "${PIHOLELOG}") \
+### PiHole application specific logging ###
-  && log_write "${PIHOLELOG} is ${pihole_length} lines long." \
+echo "::: Writing whitelist to debug log..."
-  || log_echo "Warning: No pihole.log file found!"
+echo "#######################################" >> $DEBUG_LOG
 echo "############## Whitelist ##############" >> $DEBUG_LOG
 echo "#######################################" >> $DEBUG_LOG
 if [ -e "$WHITELISTFILE" ]
 then
 	cat "$WHITELISTFILE" >> $DEBUG_LOG
 	echo >> $DEBUG_LOG
 else
 	echo "No whitelist.txt file found!" >> $DEBUG_LOG
 	printf ":::\tNo whitelist.txt file found!\n"
 fi
-  pihole_size=$(du -h "${PIHOLELOG}" | awk '{ print $1 }') \
+echo "::: Writing blacklist to debug log..."
-  && log_write "${PIHOLELOG} is ${pihole_size}." \
+echo "#######################################" >> $DEBUG_LOG
-  || log_echo "Warning: No pihole.log file found!"
+echo "############## Blacklist ##############" >> $DEBUG_LOG
 echo "#######################################" >> $DEBUG_LOG
 if [ -e "$BLACKLISTFILE" ]
 then
 	cat "$BLACKLISTFILE" >> $DEBUG_LOG
 	echo >> $DEBUG_LOG
 else
 	echo "No blacklist.txt file found!" >> $DEBUG_LOG
 	printf ":::\tNo blacklist.txt file found!\n"
 fi
 echo "::: Writing adlists.list to debug log..."
 echo "#######################################" >> $DEBUG_LOG
 echo "############ adlists.list #############" >> $DEBUG_LOG
 echo "#######################################" >> $DEBUG_LOG
 if [ -e "$ADLISTSFILE" ]
 then
 	cat "$ADLISTSFILE" >> $DEBUG_LOG
 	echo >> $DEBUG_LOG
 else
 	echo "No adlists.list file found... using adlists.default!" >> $DEBUG_LOG
 	printf ":::\tNo adlists.list file found... using adlists.default!\n"
 fi
 # Continuously append the pihole.log file to the pihole_debug.log file
-dumpPiHoleLog() {
+function dumpPiHoleLog {
 	trap '{ echo -e "\n::: Finishing debug write from interrupt... Quitting!" ; exit 1; }' INT
-	echo "::: "
+	echo -e "::: Writing current pihole traffic to debug log...\n:::\tTry loading any/all sites that you are having trouble with now... \n:::\t(Press ctrl+C to finish)"
-	echo "::: --= User Action Required =--"
+	echo "#######################################" >> $DEBUG_LOG
-	echo -e "::: Try loading a site that you are having trouble with now from a client web browser.. \n:::\t(Press CTRL+C to finish logging.)"
+	echo "############# pihole.log ##############" >> $DEBUG_LOG
-	header_write "pihole.log"
+	echo "#######################################" >> $DEBUG_LOG
-	if [ -e "${PIHOLELOG}" ]; then
+	if [ -e "$PIHOLELOG" ]
-	# Dummy process to use for flagging down tail to terminate
+	then
-	  countdown &
+		while true; do
-		tail -n0 -f --pid=$! "${PIHOLELOG}" >> ${DEBUG_LOG}
+			tail -f "$PIHOLELOG" >> $DEBUG_LOG
 			echo >> $DEBUG_LOG
 		done
 	else
-		log_write "No pihole.log file found!"
+		echo "No pihole.log file found!" >> $DEBUG_LOG
 		printf ":::\tNo pihole.log file found!\n"
 	fi
 }
 # Anything to be done after capturing of pihole.log terminates
-finalWork() {
+function finalWork {
  local tricorder
 	echo "::: Finshed debugging!" 
-	echo "::: The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
+	echo "::: Debug log can be found at : /var/log/pihole_debug.log"
 	if [[ "${AUTOMATED}" ]]; then
 	  echo "::: Debug script running in automated mode, uploading log to tricorder..."
 	  tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999)
 	else
 	  read -r -p "::: Would you like to upload the log? [y/N] " response
 	  case ${response} in
 		  [yY][eE][sS]|[yY])
 			  tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999)
 			  ;;
 		  *)
 			  echo "::: Log will NOT be uploaded to tricorder."
 			  ;;
 	  esac
  fi
 	# Check if tricorder.pi-hole.net is reachable and provide token.
 	if [ -n "${tricorder}" ]; then
 		echo "::: ---=== Your debug token is : ${tricorder} Please make a note of it. ===---"
 		echo "::: Contact the Pi-hole team with your token for assistance."
 		echo "::: Thank you."
 	else
 		echo "::: There was an error uploading your debug log."
 		echo "::: Please try again or contact the Pi-hole team for assistance."
 	fi
 		echo "::: A local copy of the Debug log can be found at : /var/log/pihole_debug.log"
 }
 trap finalWork EXIT
 ### Method calls for additional logging ###
@@ -1,20 +1,15 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Flushes /var/log/pihole.log
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation, either version 2 of the License, or
-
+# (at your option) any later version.
 echo -n "::: Flushing /var/log/pihole.log ..."
-# Test if logrotate is available on this system
+truncate -s 0 /var/log/pihole.log
 if command -v /usr/sbin/logrotate &> /dev/null; then
  /usr/sbin/logrotate --force /etc/pihole/logrotate
 else
  echo " " > /var/log/pihole.log
 fi
 echo "... done!"
@@ -1,42 +1,57 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Automatically configures the Pi to use the 2.8 LCD screen to display stats on it (also works over ssh)
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation, either version 2 of the License, or
-
+# (at your option) any later version.
 ############ FUNCTIONS ###########
 # Run this script as root or under sudo
 echo ":::"
 if [[ $EUID -eq 0 ]];then
 	echo "::: You are root."
 else
 	echo "::: sudo will be used."
  # Check if it is actually installed
  # If it isn't, exit because the install cannot complete
  if [[ $(dpkg-query -s sudo) ]];then
 		export SUDO="sudo"
  else
 		echo "::: Please install sudo or run this script as root."
    exit 1
  fi
 fi
 # Borrowed from adafruit-pitft-helper < borrowed from raspi-config
 # https://github.com/adafruit/Adafruit-PiTFT-Helper/blob/master/adafruit-pitft-helper#L324-L334
 getInitSys() {
-	if command -v systemctl > /dev/null && systemctl | grep -q '\-\.mount'; then
+  if command -v systemctl > /dev/null && systemctl | grep -q '\-\.mount'; then
-		SYSTEMD=1
+    SYSTEMD=1
-	elif [ -f /etc/init.d/cron ] && [ ! -h /etc/init.d/cron ]; then
+  elif [ -f /etc/init.d/cron ] && [ ! -h /etc/init.d/cron ]; then
-		SYSTEMD=0
+    SYSTEMD=0
-	else
+  else
-		echo "Unrecognised init system"
+    echo "Unrecognised init system"
-		return 1
+    return 1
-	fi
+  fi
 }
 # Borrowed from adafruit-pitft-helper:
 # https://github.com/adafruit/Adafruit-PiTFT-Helper/blob/master/adafruit-pitft-helper#L274-L285
 autoLoginPiToConsole() {
-	if [ -e /etc/init.d/lightdm ]; then
+  if [ -e /etc/init.d/lightdm ]; then
-		if [ ${SYSTEMD} -eq 1 ]; then
+    if [ $SYSTEMD -eq 1 ]; then
-			systemctl set-default multi-user.target
+      $SUDO systemctl set-default multi-user.target
-			ln -fs /etc/systemd/system/autologin@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
+      $SUDO ln -fs /etc/systemd/system/autologin@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
-		else
+    else
-			update-rc.d lightdm disable 2
+      $SUDO update-rc.d lightdm disable 2
-			sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
+      $SUDO sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
-		fi
+      fi
-	fi
+  fi
 }
 ######### SCRIPT ###########
@@ -51,23 +66,23 @@ echo /usr/local/bin/chronometer.sh >> /home/pi/.bashrc
 # Set up the LCD screen based on Adafruits instuctions:
 # https://learn.adafruit.com/adafruit-pitft-28-inch-resistive-touchscreen-display-raspberry-pi/easy-install
-curl -SLs https://apt.adafruit.com/add-pin | bash
+curl -SLs https://apt.adafruit.com/add-pin | $SUDO bash
-apt-get -y install raspberrypi-bootloader
+$SUDO apt-get -y install raspberrypi-bootloader
-apt-get -y install adafruit-pitft-helper
+$SUDO apt-get -y install adafruit-pitft-helper
-adafruit-pitft-helper -t 28r
+$SUDO adafruit-pitft-helper -t 28r
 # Download the cmdline.txt file that prevents the screen from going blank after a period of time
-mv /boot/cmdline.txt /boot/cmdline.orig
+$SUDO mv /boot/cmdline.txt /boot/cmdline.orig
-curl -o /boot/cmdline.txt https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/cmdline.txt
+$SUDO curl -o /boot/cmdline.txt https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/cmdline.txt
 # Back up the original file and download the new one
-mv /etc/default/console-setup /etc/default/console-setup.orig
+$SUDO mv /etc/default/console-setup /etc/default/console-setup.orig
-curl -o /etc/default/console-setup https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/console-setup
+$SUDO curl -o /etc/default/console-setup https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/console-setup
 # Instantly apply the font change to the LCD screen
-setupcon
+$SUDO setupcon
-reboot
+$SUDO reboot
 # Start showing the stats on the screen by running the command on another tty:
 # http://unix.stackexchange.com/questions/170063/start-a-process-on-a-different-tty
@@ -1,181 +0,0 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
 #
 # Check Pi-hole core and admin pages versions and determine what
 # upgrade (if any) is required. Automatically updates and reinstalls
 # application if update is detected.
 #
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 # Variables
 readonly ADMIN_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
 readonly ADMIN_INTERFACE_DIR="/var/www/html/admin"
 readonly PI_HOLE_GIT_URL="https://github.com/pi-hole/pi-hole.git"
 readonly PI_HOLE_FILES_DIR="/etc/.pihole"
 PH_TEST=true
 source ${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh
 # is_repo() sourced from basic-install.sh
 # make_repo() sourced from basic-install.sh
 # update_repo() source from basic-install.sh
 # getGitFiles() sourced from basic-install.sh
 GitCheckUpdateAvail() {
  local directory="${1}"
  curdir=$PWD
  cd "${directory}"
  # Fetch latest changes in this repo
  git fetch --quiet origin
  # @ alone is a shortcut for HEAD. Older versions of git
  # need @{0}
  LOCAL="$(git rev-parse @{0})"
  # The suffix @{upstream} to a branchname
  # (short form <branchname>@{u}) refers
  # to the branch that the branch specified
  # by branchname is set to build on top of#
  # (configured with branch.<name>.remote and
  # branch.<name>.merge). A missing branchname
  # defaults to the current one.
  REMOTE="$(git rev-parse @{upstream})"
  if [[ ${#LOCAL} == 0 ]]; then
    echo "::: Error: Local revision could not be obtained, ask Pi-hole support."
    echo "::: Additional debugging output:"
    git status
    exit
  fi
  if [[ ${#REMOTE} == 0 ]]; then
    echo "::: Error: Remote revision could not be obtained, ask Pi-hole support."
    echo "::: Additional debugging output:"
    git status
    exit
  fi
  # Change back to original directory
  cd "${curdir}"
  if [[ "${LOCAL}" != "${REMOTE}" ]]; then
    # Local branch is behind remote branch -> Update
    return 0
  else
    # Local branch is up-to-date or in a situation
    # where this updater cannot be used (like on a
    # branch that exists only locally)
    return 1
  fi
 }
 main() {
  local pihole_version_current
  local web_version_current
  #This is unlikely
  if ! is_repo "${PI_HOLE_FILES_DIR}" ; then
    echo "::: Critical Error: Core Pi-Hole repo is missing from system!"
    echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
    exit 1;
  fi
  echo "::: Checking for updates..."
  if GitCheckUpdateAvail "${PI_HOLE_FILES_DIR}" ; then
    core_update=true
    echo "::: Pi-hole Core:   update available"
  else
    core_update=false
    echo "::: Pi-hole Core:   up to date"
  fi
  if [[ ${INSTALL_WEB} == true ]]; then
    if ! is_repo "${ADMIN_INTERFACE_DIR}" ; then
      echo "::: Critical Error: Web Admin repo is missing from system!"
      echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
      exit 1;
    fi
    if GitCheckUpdateAvail "${ADMIN_INTERFACE_DIR}" ; then
      web_update=true
      echo "::: Web Interface:  update available"
    else
      web_update=false
      echo "::: Web Interface:  up to date"
    fi
    # Logic
    # If Core up to date AND web up to date:
    #            Do nothing
    # If Core up to date AND web NOT up to date:
    #            Pull web repo
    # If Core NOT up to date AND web up to date:
    #            pull pihole repo, run install --unattended -- reconfigure
    # if Core NOT up to date AND web NOT up to date:
    #            pull pihole repo run install --unattended
    if ! ${core_update} && ! ${web_update} ; then
      echo ":::"
      echo "::: Everything is up to date!"
      exit 0
    elif ! ${core_update} && ${web_update} ; then
      echo ":::"
      echo "::: Pi-hole Web Admin files out of date"
      getGitFiles "${ADMIN_INTERFACE_DIR}" "${ADMIN_INTERFACE_GIT_URL}"
    elif ${core_update} && ! ${web_update} ; then
      echo ":::"
      echo "::: Pi-hole core files out of date"
      getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
      ${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --reconfigure --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
    elif ${core_update} && ${web_update} ; then
      echo ":::"
      echo "::: Updating Everything"
      getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
      ${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
    else
      echo "*** Update script has malfunctioned, fallthrough reached. Please contact support"
      exit 1
    fi
  else # Web Admin not installed, so only verify if core is up to date
    if ! ${core_update}; then
      echo ":::"
      echo "::: Everything is up to date!"
      exit 0
    else
      echo ":::"
      echo "::: Pi-hole core files out of date"
      getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
      ${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --reconfigure --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
    fi
  fi
  if [[ "${web_update}" == true ]]; then
    web_version_current="$(/usr/local/bin/pihole version --admin --current)"
    echo ":::"
    echo "::: Web Admin version is now at ${web_version_current}"
    echo "::: If you had made any changes in '/var/www/html/admin/', they have been stashed using 'git stash'"
  fi
  if [[ "${core_update}" == true ]]; then
    pihole_version_current="$(/usr/local/bin/pihole version --pihole --current)"
    echo ":::"
    echo "::: Pi-hole version is now at ${pihole_version_current}"
    echo "::: If you had made any changes in '/etc/.pihole/', they have been stashed using 'git stash'"
  fi
  echo ""
  exit 0
 }
 main
@@ -0,0 +1,69 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Updates the Pi-hole web interface
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 WEB_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
 WEB_INTERFACE_DIR="/var/www/html/admin"
 main() {
    prerequisites
    if ! is_repo; then
        make_repo
    fi
    update_repo
 }
 prerequisites() {
    # must be root to update
    if [[ $EUID -ne 0 ]]; then
        sudo bash "$0" "$@"
        exit $?
    fi
    # web interface must already exist. this is a (lazy)
    # check to make sure pihole is actually installed.
    if [ ! -d "$WEB_INTERFACE_DIR" ]; then
        echo "$WEB_INTERFACE_DIR not found. Exiting."
        exit 1
    fi
    if ! type "git" > /dev/null; then
        apt-get -y install git
    fi
 }
 is_repo() {
    # if the web interface directory does not have a .git folder
    # it means its using the master.zip archive from the install
    # script.
    if [ ! -d "$WEB_INTERFACE_DIR/.git" ]; then
        return 1
    fi
    return 0
 }
 # removes the web interface installed from the master.zip archive and
 # replaces it with the current master branch from github
 make_repo() {
    # remove the non-repod interface and clone the interface
    rm -rf $WEB_INTERFACE_DIR
    git clone "$WEB_INTERFACE_GIT_URL" "$WEB_INTERFACE_DIR"
 }
 # pulls the latest master branch from github
 update_repo() {
    # pull the latest commits
    cd "$WEB_INTERFACE_DIR"
    git pull
 }
 main
@@ -0,0 +1,32 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Checks if Pi-hole needs updating and then
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 # Taken from http://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
 # Move into the git directory
 cd /etc/.pihole/
 LOCAL=$(git rev-parse @)
 REMOTE=$(git rev-parse @{u})
 BASE=$(git merge-base @ @{u})
 if [[ $LOCAL = $REMOTE ]]; then
  echo "Up-to-date"
 elif [[ $LOCAL = $BASE ]]; then
  echo "Updating Pi-hole..."
  git pull
  /opt/pihole/updatePiholeSecondary.sh
 elif [[ $REMOTE = $BASE ]]; then
  : # Need to push, so do nothing
 else
  : # Diverged, so do nothing
 fi
@@ -0,0 +1,103 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Checks if Pi-hole needs updating and then
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 # Must be root to use this tool
 if [[ ! $EUID -eq 0 ]];then
 	#echo "::: You are root."
 #else
 	#echo "::: Sudo will be used for this tool."
  # Check if it is actually installed
  # If it isn't, exit because the pihole cannot be invoked without privileges.
  if [[ $(dpkg-query -s sudo) ]];then
 		export SUDO="sudo"
  else
    echo "::: Please install sudo or run this as root."
    exit 1
  fi
 fi
 function updateDependencies(){
 	#Add any new dependencies to the below array`
 	newDependencies=()
 	echo "::: Installing any new dependencies..."
 	for i in "${newDependencies[@]}"; do
 		echo "checking for $i"
 		if [ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then
 			echo -n " Not found! Installing...."
 			$SUDO apt-get -y -qq install "$i" > /dev/null & spinner $!
 			echo " done!"
 		else
 			echo " already installed!"
 		fi
 	done
 	}
 }
 stopServices() {
 	# Stop dnsmasq and lighttpd
 	echo ":::"
 	echo -n "::: Stopping services..."
 	$SUDO service lighttpd stop
 	echo " done."
 }
 installScripts() {
 	# Install the scripts from /etc/.pihole to their various locations
 	echo ":::"
 	echo -n "::: Updating scripts in /opt/pihole..."
 	$SUDO cp /etc/.pihole/gravity.sh /opt/pihole/gravity.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/chronometer.sh /opt/pihole/chronometer.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/whitelist.sh /opt/pihole/whitelist.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/blacklist.sh /opt/pihole/blacklist.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/piholeDebug.sh /opt/pihole/piholeDebug.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/piholeLogFlush.sh /opt/pihole/piholeLogFlush.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/updateDashboard.sh /opt/pihole/updateDashboard.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/updatePihole.sh /opt/pihole/updatePihole.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/updatePiholeSecondary.sh /opt/pihole/updatePiholeSecondary.sh
 	$SUDO cp /etc/.pihole/automated\ install/uninstall.sh /opt/pihole/uninstall.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/setupLCD.sh /opt/pihole/setupLCD.sh
 	$SUDO chmod 755 /opt/pihole/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard,updatePihole,updatePiholeSecondary,uninstall,setupLCD, piholeDebug}.sh
 	$SUDO cp /etc/.pihole/pihole /usr/local/bin/pihole
 	$SUDO chmod 755 /usr/local/bin/pihole
 	$SUDO cp /etc/.pihole/advanced/bash-completion/pihole /etc/bash_completion.d/pihole
 	. /etc/bash_completion.d/pihole
 	#Tidy up /usr/local/bin directory if updating an old installation (can probably be removed at some point)
 	oldFiles=( gravity chronometer whitelist blacklist piholeLogFlush updateDashboard updatePihole updatePiholeSecondary uninstall setupLCD piholeDebug)
 	for i in "${oldFiles[@]}"; do
 		if [ -f "/usr/local/bin/$i.sh" ]; then
 			$SUDO rm /usr/local/bin/"$i".sh
 		fi
 	done
 	echo " done."
 }
 ########################
 # SCRIPT STARTS HERE! #
 #######################
 #uncomment the below if adding new dependencies (don't forget to update the install script!)
 #updateDependencies
 stopServices
 installScripts
 #TODO:
 # - Distribute files`
 # - Run pihole -g
 # - add root check, maybe? Do we need to? Probably a good idea.
 # - update install script to populate a config file with:
 #       -IPv4
 #       -IPv6
 #       -UpstreamDNS servers
@@ -1,102 +0,0 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
 #
 # shows version numbers
 #
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 # Flags:
 latest=false
 current=false
 DEFAULT="-1"
 normalOutput() {
 	piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
 	webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
 	piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 	webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 	echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest:-${DEFAULT}})"
 	echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest:-${DEFAULT}})"
 }
 webOutput() {
 	for var in "$@"; do
 		case "${var}" in
 			"-l" | "--latest"    ) latest=true;;
 			"-c" | "--current"   ) current=true;;
 			*                    ) echo "::: Invalid Option!"; exit 1;
 		esac
 	done
 	if [[ "${latest}" == true && "${current}" == false ]]; then
 		webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 		echo "${webVersionLatest:--1}"
 	elif [[ "${latest}" == false && "${current}" == true ]]; then
 		webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
 		echo "${webVersion}"
 	else
 		webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
 		webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 		echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest:-${DEFAULT}})"
 	fi
 }
 coreOutput() {
 	for var in "$@"; do
 		case "${var}" in
 			"-l" | "--latest"    ) latest=true;;
 			"-c" | "--current"   ) current=true;;
 			*                    ) echo "::: Invalid Option!"; exit 1;
 		esac
 	done
 	if [[ "${latest}" == true && "${current}" == false ]]; then
 		piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 		echo "${piholeVersionLatest:--1}"
 	elif [[ "${latest}" == false && "${current}" == true ]]; then
 		piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
 		echo "${piholeVersion}"
 	else
 		piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
 		piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 		echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest:-${DEFAULT}})"
 	fi
 }
 helpFunc() {
 	cat << EOM
 :::
 ::: Show Pi-hole/Web Admin versions
 :::
 ::: Usage: pihole -v [ -a | -p ] [ -l | -c ]
 :::
 ::: Options:
 :::  -a, --admin          Show both current and latest versions of web admin
 :::  -p, --pihole         Show both current and latest versions of Pi-hole core files
 :::  -l, --latest         (Only after -a | -p) Return only latest version
 :::  -c, --current        (Only after -a | -p) Return only current version
 :::  -h, --help           Show this help dialog
 :::
 EOM
 	exit 0
 }
 if [[ $# = 0 ]]; then
 	normalOutput
 fi
 for var in "$@"; do
 	case "${var}" in
 	"-a" | "--admin"     ) shift; webOutput "$@";;
 	"-p" | "--pihole"    ) shift; coreOutput "$@" ;;
 	"-h" | "--help"      ) helpFunc;;
 	esac
 done
@@ -1,449 +0,0 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
 #
 # Web interface settings
 #
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 readonly setupVars="/etc/pihole/setupVars.conf"
 readonly dnsmasqconfig="/etc/dnsmasq.d/01-pihole.conf"
 readonly dhcpconfig="/etc/dnsmasq.d/02-pihole-dhcp.conf"
 # 03 -> wildcards
 readonly dhcpstaticconfig="/etc/dnsmasq.d/04-pihole-static-dhcp.conf"
 helpFunc() {
 	cat << EOM
 ::: Set admin options for the web interface of pihole
 :::
 ::: Usage: pihole -a [options]
 :::
 ::: Options:
 :::  -p, password		Set web interface password, an empty input will remove any previously set password
 :::  -c, celsius		Set Celsius temperature unit
 :::  -f, fahrenheit		Set Fahrenheit temperature unit
 :::  -k, kelvin			Set Kelvin temperature unit
 :::  -h, --help			Show this help dialog
 :::  -i, interface		Setup interface listening behavior of dnsmasq
 :::               		pihole -a -i local  : Listen on all interfaces, but allow only queries from
 :::               		                      devices that are at most one hop away (local devices)
 :::               		pihole -a -i single : Listen only on one interface (see PIHOLE_INTERFACE)
 :::               		pihole -a -i all    : Listen on all interfaces, permit all origins
 EOM
 	exit 0
 }
 add_setting() {
 	echo "${1}=${2}" >> "${setupVars}"
 }
 delete_setting() {
 	sed -i "/${1}/d" "${setupVars}"
 }
 change_setting() {
 	delete_setting "${1}"
 	add_setting "${1}" "${2}"
 }
 add_dnsmasq_setting() {
 	if [[ "${2}" != "" ]]; then
 		echo "${1}=${2}" >> "${dnsmasqconfig}"
 	else
 		echo "${1}" >> "${dnsmasqconfig}"
 	fi
 }
 delete_dnsmasq_setting() {
 	sed -i "/${1}/d" "${dnsmasqconfig}"
 }
 SetTemperatureUnit(){
 	change_setting "TEMPERATUREUNIT" "${unit}"
 }
 SetWebPassword(){
 	if [ "${SUDO_USER}" == "www-data" ]; then
 		echo "Security measure: user www-data is not allowed to change webUI password!"
 		echo "Exiting"
 		exit 1
 	fi
 	if [ "${SUDO_USER}" == "lighttpd" ]; then
 		echo "Security measure: user lighttpd is not allowed to change webUI password!"
 		echo "Exiting"
 		exit 1
 	fi
 	# Set password only if there is one to be set
 	if (( ${#args[2]} > 0 )) ; then
 		# Compute password hash twice to avoid rainbow table vulnerability
 		hash=$(echo -n ${args[2]} | sha256sum | sed 's/\s.*$//')
 		hash=$(echo -n ${hash} | sha256sum | sed 's/\s.*$//')
 		# Save hash to file
 		change_setting "WEBPASSWORD" "${hash}"
 		echo "New password set"
 	else
 		change_setting "WEBPASSWORD" ""
 		echo "Password removed"
 	fi
 }
 ProcessDNSSettings() {
 	source "${setupVars}"
 	delete_dnsmasq_setting "server"
 	COUNTER=1
 	while [[ 1 ]]; do
 		var=PIHOLE_DNS_${COUNTER}
 		if [ -z "${!var}" ]; then
 			break;
 		fi
 		add_dnsmasq_setting "server" "${!var}"
 		let COUNTER=COUNTER+1
 	done
 	delete_dnsmasq_setting "domain-needed"
 	if [[ "${DNS_FQDN_REQUIRED}" == true ]]; then
 		add_dnsmasq_setting "domain-needed"
 	fi
 	delete_dnsmasq_setting "bogus-priv"
 	if [[ "${DNS_BOGUS_PRIV}" == true ]]; then
 		add_dnsmasq_setting "bogus-priv"
 	fi
 	delete_dnsmasq_setting "dnssec"
 	delete_dnsmasq_setting "trust-anchor="
 	if [[ "${DNSSEC}" == true ]]; then
 		echo "dnssec
 trust-anchor=.,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
 " >> "${dnsmasqconfig}"
 	fi
 	delete_dnsmasq_setting "host-record"
 	if [ ! -z "${HOSTRECORD+x}" ]; then
 		add_dnsmasq_setting "host-record" "${HOSTRECORD}"
 	fi
 	# Setup interface listening behavior of dnsmasq
 	delete_dnsmasq_setting "interface"
 	delete_dnsmasq_setting "local-service"
 	if [[ "${DNSMASQ_LISTENING}" == "all" ]]; then
 		# Listen on all interfaces, permit all origins
 		# Leave a comment in 01-pihole.conf
 		add_dnsmasq_setting "# Listening on all interfaces"
 		add_dnsmasq_setting "except-interface" "nonexisting"
 	elif [[ "${DNSMASQ_LISTENING}" == "single" ]]; then
 		# Listen only on one interface
 		add_dnsmasq_setting "interface" "${PIHOLE_INTERFACE}"
 	else
 		# Listen only on all interfaces, but only local subnets
 		add_dnsmasq_setting "local-service"
 	fi
 }
 SetDNSServers(){
 	# Save setting to file
 	delete_setting "PIHOLE_DNS"
 	IFS=',' read -r -a array <<< "${args[2]}"
 	for index in "${!array[@]}"
 	do
 		add_setting "PIHOLE_DNS_$((index+1))" "${array[index]}"
 	done
 	if [[ "${args[3]}" == "domain-needed" ]]; then
 		change_setting "DNS_FQDN_REQUIRED" "true"
 	else
 		change_setting "DNS_FQDN_REQUIRED" "false"
 	fi
 	if [[ "${args[4]}" == "bogus-priv" ]]; then
 		change_setting "DNS_BOGUS_PRIV" "true"
 	else
 		change_setting "DNS_BOGUS_PRIV" "false"
 	fi
 	if [[ "${args[5]}" == "dnssec" ]]; then
 		change_setting "DNSSEC" "true"
 	else
 		change_setting "DNSSEC" "false"
 	fi
 	ProcessDNSSettings
 	# Restart dnsmasq to load new configuration
 	RestartDNS
 }
 SetExcludeDomains(){
 	change_setting "API_EXCLUDE_DOMAINS" "${args[2]}"
 }
 SetExcludeClients(){
 	change_setting "API_EXCLUDE_CLIENTS" "${args[2]}"
 }
 Reboot(){
 	nohup bash -c "sleep 5; reboot" &> /dev/null </dev/null &
 }
 RestartDNS(){
 	if [ -x "$(command -v systemctl)" ]; then
 		systemctl restart dnsmasq &> /dev/null
 	else
 		service dnsmasq restart &> /dev/null
 	fi
 }
 SetQueryLogOptions(){
 	change_setting "API_QUERY_LOG_SHOW" "${args[2]}"
 }
 ProcessDHCPSettings() {
 	source "${setupVars}"
 	if [[ "${DHCP_ACTIVE}" == "true" ]]; then
 	interface=$(grep 'PIHOLE_INTERFACE=' /etc/pihole/setupVars.conf | sed "s/.*=//")
 	# Use eth0 as fallback interface
 	if [ -z ${interface} ]; then
 		interface="eth0"
 	fi
 	if [[ "${PIHOLE_DOMAIN}" == "" ]]; then
 		PIHOLE_DOMAIN="local"
 		change_setting "PIHOLE_DOMAIN" "${PIHOLE_DOMAIN}"
 	fi
 	if [[ "${DHCP_LEASETIME}" == "0" ]]; then
 		leasetime="infinite"
 	elif [[ "${DHCP_LEASETIME}" == "" ]]; then
 		leasetime="24h"
 		change_setting "DHCP_LEASETIME" "${leasetime}"
 	else
 		leasetime="${DHCP_LEASETIME}h"
 	fi
 	# Write settings to file
 	echo "###############################################################################
 #  DHCP SERVER CONFIG FILE AUTOMATICALLY POPULATED BY PI-HOLE WEB INTERFACE.  #
 #            ANY CHANGES MADE TO THIS FILE WILL BE LOST ON CHANGE             #
 ###############################################################################
 dhcp-authoritative
 dhcp-range=${DHCP_START},${DHCP_END},${leasetime}
 dhcp-option=option:router,${DHCP_ROUTER}
 dhcp-leasefile=/etc/pihole/dhcp.leases
 #quiet-dhcp
 " > "${dhcpconfig}"
 if [[ "${PIHOLE_DOMAIN}" != "none" ]]; then
 	echo "domain=${PIHOLE_DOMAIN}" >> "${dhcpconfig}"
 fi
 	if [[ "${DHCP_IPv6}" == "true" ]]; then
 echo "#quiet-dhcp6
 #enable-ra
 dhcp-option=option6:dns-server,[::]
 dhcp-range=::100,::1ff,constructor:${interface},ra-names,slaac,${leasetime}
 ra-param=*,0,0
 " >> "${dhcpconfig}"
 	fi
 	else
 		rm "${dhcpconfig}" &> /dev/null
 	fi
 }
 EnableDHCP(){
 	change_setting "DHCP_ACTIVE" "true"
 	change_setting "DHCP_START" "${args[2]}"
 	change_setting "DHCP_END" "${args[3]}"
 	change_setting "DHCP_ROUTER" "${args[4]}"
 	change_setting "DHCP_LEASETIME" "${args[5]}"
 	change_setting "PIHOLE_DOMAIN" "${args[6]}"
 	change_setting "DHCP_IPv6" "${args[7]}"
 	# Remove possible old setting from file
 	delete_dnsmasq_setting "dhcp-"
 	delete_dnsmasq_setting "quiet-dhcp"
 	ProcessDHCPSettings
 	RestartDNS
 }
 DisableDHCP(){
 	change_setting "DHCP_ACTIVE" "false"
 	# Remove possible old setting from file
 	delete_dnsmasq_setting "dhcp-"
 	delete_dnsmasq_setting "quiet-dhcp"
 	ProcessDHCPSettings
 	RestartDNS
 }
 SetWebUILayout(){
 	change_setting "WEBUIBOXEDLAYOUT" "${args[2]}"
 }
 SetPrivacyMode(){
 	if [[ "${args[2]}" == "true" ]] ; then
 		change_setting "API_PRIVACY_MODE" "true"
 	else
 		change_setting "API_PRIVACY_MODE" "false"
 	fi
 }
 ResolutionSettings() {
 	typ="${args[2]}"
 	state="${args[3]}"
 	if [[ "${typ}" == "forward" ]]; then
 		change_setting "API_GET_UPSTREAM_DNS_HOSTNAME" "${state}"
 	elif [[ "${typ}" == "clients" ]]; then
 		change_setting "API_GET_CLIENT_HOSTNAME" "${state}"
 	fi
 }
 AddDHCPStaticAddress() {
 	mac="${args[2]}"
 	ip="${args[3]}"
 	host="${args[4]}"
 	if [[ "${ip}" == "noip" ]]; then
 		# Static host name
 		echo "dhcp-host=${mac},${host}" >> "${dhcpstaticconfig}"
 	elif [[ "${host}" == "nohost" ]]; then
 		# Static IP
 		echo "dhcp-host=${mac},${ip}" >> "${dhcpstaticconfig}"
 	else
 		# Full info given
 		echo "dhcp-host=${mac},${ip},${host}" >> "${dhcpstaticconfig}"
 	fi
 }
 RemoveDHCPStaticAddress() {
 	mac="${args[2]}"
 	sed -i "/dhcp-host=${mac}.*/d" "${dhcpstaticconfig}"
 }
 SetHostRecord(){
 	if [ -n "${args[3]}" ]; then
 		change_setting "HOSTRECORD" "${args[2]},${args[3]}"
 		echo "Setting host record for ${args[2]} -> ${args[3]}"
 	else
 		change_setting "HOSTRECORD" ""
 		echo "Removing host record"
 	fi
 	ProcessDNSSettings
 	# Restart dnsmasq to load new configuration
 	RestartDNS
 }
 SetListeningMode(){
 	source "${setupVars}"
 	if [[ "${args[2]}" == "all" ]] ; then
 		echo "Listening on all interfaces, permiting all origins, hope you have a firewall!"
 		change_setting "DNSMASQ_LISTENING" "all"
 	elif [[ "${args[2]}" == "single" ]] ; then
 		echo "Listening only on interface ${PIHOLE_INTERFACE}"
 		change_setting "DNSMASQ_LISTENING" "single"
 	else
 		echo "Listening on all interfaces, permitting only origins that are at most one hop away (local devices)"
 		change_setting "DNSMASQ_LISTENING" "local"
 	fi
 	# Don't restart DNS server yet because other settings
 	# will be applied afterwards if "-web" is set
 	if [[ "${args[3]}" != "-web" ]]; then
 		ProcessDNSSettings
 		# Restart dnsmasq to load new configuration
 		RestartDNS
 	fi
 }
 main() {
 	args=("$@")
 	case "${args[1]}" in
 		"-p" | "password"   ) SetWebPassword;;
 		"-c" | "celsius"    ) unit="C"; SetTemperatureUnit;;
 		"-f" | "fahrenheit" ) unit="F"; SetTemperatureUnit;;
 		"-k" | "kelvin"     ) unit="K"; SetTemperatureUnit;;
 		"setdns"            ) SetDNSServers;;
 		"setexcludedomains" ) SetExcludeDomains;;
 		"setexcludeclients" ) SetExcludeClients;;
 		"reboot"            ) Reboot;;
 		"restartdns"        ) RestartDNS;;
 		"setquerylog"       ) SetQueryLogOptions;;
 		"enabledhcp"        ) EnableDHCP;;
 		"disabledhcp"       ) DisableDHCP;;
 		"layout"            ) SetWebUILayout;;
 		"-h" | "--help"     ) helpFunc;;
 		"privacymode"       ) SetPrivacyMode;;
 		"resolve"           ) ResolutionSettings;;
 		"addstaticdhcp"     ) AddDHCPStaticAddress;;
 		"removestaticdhcp"  ) RemoveDHCPStaticAddress;;
 		"hostrecord"        ) SetHostRecord;;
 		"-i" | "interface"  ) SetListeningMode;;
 		*                   ) helpFunc;;
 	esac
 	shift
 	if [[ $# = 0 ]]; then
 		helpFunc
 	fi
 }
@@ -0,0 +1,256 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Whitelists domains
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #rootcheck
 if [[ $EUID -eq 0 ]];then
 	echo "::: You are root."
 else
 	echo "::: sudo will be used."
 	# Check if it is actually installed
 	# If it isn't, exit because the install cannot complete
 	if [[ $(dpkg-query -s sudo) ]];then
 		export SUDO="sudo"
 	else
 		echo "::: Please install sudo or run this script as root."
 		exit 1
 	fi
 fi
 if [[ $# = 0 ]]; then
 	helpFunc
 fi
 #globals
 basename=pihole
 piholeDir=/etc/$basename
 adList=$piholeDir/gravity.list
 whitelist=$piholeDir/whitelist.txt
 reload=true
 addmode=true
 force=false
 verbose=true
 domList=()
 domToRemoveList=()
 piholeIPfile=/etc/pihole/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
 if [[ -f $piholeIPfile ]];then
    # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
    piholeIP=$(cat $piholeIPfile)
    #rm $piholeIPfile
 else
    # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
    piholeIPCIDR=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}')
    piholeIP=${piholeIPCIDR%/*}
 fi
 modifyHost=false
 # After setting defaults, check if there's local overrides
 if [[ -r $piholeDir/pihole.conf ]];then
    echo "::: Local calibration requested..."
        . $piholeDir/pihole.conf
 fi
 if [[ -f $piholeIPv6file ]];then
    # If the file exists, then the user previously chose to use IPv6 in the automated installer
    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 fi
 function helpFunc()
 {
 	echo "::: Immediately whitelists one or more domains in the hosts file"
 	echo ":::"
 	echo "::: Usage: pihole -w domain1 [domain2 ...]"
 	echo ":::"
 	echo "::: Options:"
 	echo ":::  -d, --delmode			Remove domains from the whitelist"
 	echo ":::  -nr, --noreload			Update Whitelist without refreshing dnsmasq"
 	echo ":::  -f, --force				Force updating of the hosts files, even if there are no changes"
 	echo ":::  -q, --quiet				output is less verbose"
 	echo ":::  -h, --help				Show this help dialog"
 	echo ":::  -l, --list				Display your whitelisted domains"
 	exit 1
 }
 if [[ $# = 0 ]]; then
 	helpFunc
 fi
 function HandleOther(){
  #check validity of domain
 	validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
 	if [ -z "$validDomain" ]; then
 		echo "::: $1 is not a valid argument or domain name"
 	else
 	  domList=("${domList[@]}" $validDomain)
 	fi
 }
 function PopWhitelistFile(){
 	#check whitelist file exists, and if not, create it
 	if [[ ! -f $whitelist ]];then
  	  touch $whitelist
 	fi
 	for dom in "${domList[@]}"
 	do
 	  if $addmode; then
 	  	AddDomain "$dom"
 	  else
 	    RemoveDomain "$dom"
 	  fi
 	done
 }
 function AddDomain(){
 #| sed 's/\./\\./g'
 	bool=false
 	grep -Ex -q "$1" $whitelist || bool=true
 	if $bool; then
 	  #domain not found in the whitelist file, add it!
 	  if $verbose; then
 		echo -n "::: Adding $1 to $whitelist..."
 	  fi
 	  echo "$1" >> $whitelist
 		modifyHost=true
 		if $verbose; then
 	  	echo " done!"
 	  fi
 	else
 		if $verbose; then
 			echo "::: $1 already exists in $whitelist, no need to add!"
 		fi
 	fi
 }
 function RemoveDomain(){
  bool=false
  grep -Ex -q "$1" $whitelist || bool=true
  if $bool; then
  	#Domain is not in the whitelist file, no need to Remove
  	if $verbose; then
  	echo "::: $1 is NOT whitelisted! No need to remove"
  	fi
  else
    #Domain is in the whitelist file, add to a temporary array and remove from whitelist file
    #if $verbose; then
    #echo "::: Un-whitelisting $dom..."
    #fi
    domToRemoveList=("${domToRemoveList[@]}" $1)
    modifyHost=true
  fi
 }
 function ModifyHostFile(){
 	 if $addmode; then
 	    #remove domains in  from hosts file
 	    if [[ -r $whitelist ]];then
        # Remove whitelist entries
 				numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
        plural=; [[ "$numberOf" != "1" ]] && plural=s
        echo ":::"
        echo -n "::: Modifying HOSTS file to whitelist $numberOf domain${plural}..."
        awk -F':' '{print $1}' $whitelist | while read -r line; do echo "$piholeIP $line"; done > /etc/pihole/whitelist.tmp
        awk -F':' '{print $1}' $whitelist | while read -r line; do echo "$piholeIPv6 $line"; done >> /etc/pihole/whitelist.tmp
        echo "l" >> /etc/pihole/whitelist.tmp
        grep -F -x -v -f $piholeDir/whitelist.tmp $adList > $piholeDir/gravity.tmp
        rm $adList
        mv $piholeDir/gravity.tmp $adList
        rm $piholeDir/whitelist.tmp
        echo " done!"
 	  	fi
 	  else
 	    #we need to add the removed domains to the hosts file
 	    echo ":::"
 	    echo "::: Modifying HOSTS file to un-whitelist domains..."
 	    for rdom in "${domToRemoveList[@]}"
 	    do
 	    	if [[ -n $piholeIPv6 ]];then
 	    	  echo -n ":::    Un-whitelisting $rdom on IPv4 and IPv6..."
 	    	  echo "$rdom" | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
 	    	  echo " done!"
 	      else
 	        echo -n ":::    Un-whitelisting $rdom on IPv4"
 	      	echo "$rdom" | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
 	      	echo " done!"
 	      fi
 	      echo -n ":::        Removing $rdom from $whitelist..."
 	      echo "$rdom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $whitelist
 	      echo " done!"
 	    done
 	  fi
 }
 function Reload() {
 	# Reload hosts file
 	echo ":::"
 	echo -n "::: Refresh lists in dnsmasq..."
 	dnsmasqPid=$(pidof dnsmasq)
 	if [[ $dnsmasqPid ]]; then
 		# service already running - reload config
 		$SUDO killall -s HUP dnsmasq
 	else
 		# service not running, start it up
 		$SUDO service dnsmasq start
 	fi
 	echo " done!"
 }
 function DisplayWlist() {
 	verbose=false
 	echo -e " Displaying Gravity Resistant Domains \n"
 	count=1
 	while IFS= read -r RD
 	do
 		echo "${count}: $RD"
 		count=$((count+1))
 	done < "$whitelist"
 }
 ###################################################
 for var in "$@"
 do
  case "$var" in
    "-nr"| "--noreload"  ) reload=false;;
    "-d" | "--delmode"   ) addmode=false;;
    "-f" | "--force"     ) force=true;;
    "-q" | "--quiet"     ) verbose=false;;
    "-h" | "--help"      ) helpFunc;;
    "-l" | "--list"      ) DisplayWlist;;
    *                    ) HandleOther "$var";;
  esac
 done
 PopWhitelistFile
 if $modifyHost || $force; then
 	 ModifyHostFile
 else
  if $verbose; then
 	  echo ":::"
 		echo "::: No changes need to be made"
 	fi
 	exit 1
 fi
 if $reload; then
 	Reload
 fi
@@ -1,11 +1,12 @@
-_pihole() {
+_pihole() 
-	local cur prev opts
+{
-	COMPREPLY=()
+    local cur prev opts
-	cur="${COMP_WORDS[COMP_CWORD]}"
+    COMPREPLY=()
-	prev="${COMP_WORDS[COMP_CWORD-1]}"
+    cur="${COMP_WORDS[COMP_CWORD]}"
-	opts="admin blacklist chronometer debug disable enable flush help logging query reconfigure restartdns setupLCD status tail uninstall updateGravity updatePihole version whitelist"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
    opts="whitelist blacklist debug flush updateDashboard updateGravity setupLCD chronometer uninstall help"
-	COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-	return 0
+    return 0
 }
 complete -F _pihole pihole
@@ -1,136 +0,0 @@
 /* CSS Reset */
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; }
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; }
 body { line-height: 1; }
 ol, ul { list-style: none; }
 blockquote, q { quotes: none; }
 blockquote:before, blockquote:after, q:before, q:after { content: ''; content: none; }
 table { border-collapse: collapse; border-spacing: 0; }
 html { height: 100%; overflow-x: hidden; }
 /* General Style */
 a	{ color: rgba(0,60,120,0.95); text-decoration: none; } /* 1E3C5A */
 a:hover { color: rgba(210,120,0,0.95); transition-duration: .2s; } /* 255, 128, 0 */
 divs a		{ border-bottom: 1px dashed rgba(30,60,90,0.3); }
 b	{ font-weight: bold; }
 i	{ font-style: italic; }
 footer, pre, td { font-family: monospace; padding-left: 15px; }
 /*body, header { background: #E1E1E1; }*/
 body {
 	background-image: -webkit-linear-gradient(top, rgba(240,240,240,0.95), rgba(190,190,190,0.95));
 	background-image: linear-gradient(to bottom, rgba(240,240,240,0.95), rgba(190,190,190,0.95));
 	background-attachment: fixed;
 	color: rgba(64,64,64,0.95);
 	font: 14px, sans-serif;
 	line-height: 1em;
 }
 header {
 	min-width: 320px;
 	width: 100%;
 	text-shadow: 0 1px rgba(255,255,255,0.6);
 	display: table;
 	table-layout: fixed;
 	border: 1px solid rgba(0,0,0,0.25);
 	border-top-color: rgba(255,255,255,0.85);
 	border-style: solid none;
 	background-image: -webkit-linear-gradient(top, rgba(240,240,240,0.95), rgba(220,220,220,0.95));
 	background-image: linear-gradient(to bottom, rgba(240,240,240,0.95), rgba(220,220,220,0.95));
 	box-shadow:  0 0 1px 1px rgba(0,0,0,0.04);
 }
 header h1, header div {
 	display: table-cell;
 	color: inherit;
 	font-weight: bold;
 	vertical-align: middle;
 	white-space: nowrap;
 	overflow: hidden;
 	box-sizing: border-box;
 }
 header h1 {
 	font-size: 22px;
 	font-weight: bold;
 	width: 100%;
 	padding: 8px 0;
 	text-indent: 32px;
 	background: url("http://pi.hole/admin/img/logo.svg") left no-repeat;
 	background-size: 30px 22px;
 }
 header h1 a, h1 a:hover { color: inherit; }
 header .alt { width: 85px; font-size: 0.8em; padding-right: 4px; text-align: right; line-height: 1.25em; }
 .active { color: green; }
 .inactive { color: red; }
 main {
 	display: block;
 	width: 80%;
 	padding: 10px;
 	font-size: 1em;
 	background-color: rgba(255,255,255,0.85);
 	margin: 8px auto;
 	box-sizing: border-box;
 	border: 1px solid rgba(0,0,0,0.25);
 	box-shadow:  4px 4px rgba(0,0,0,0.1);
 	line-height: 1.2em;
 	border-radius: 8px;
 }
 h2 { /* Rgba is shared with .transparent th */
 	font: 1.15em sans-serif;
 	background-color: rgba(255,0,0,0.4);
 	text-shadow: none;
 	line-height: 1.1em;
 	padding-bottom: 1px;
 	margin-top: 8px;
 	margin-bottom: 4px;
 	background: -webkit-linear-gradient(left, rgba(0,0,0,0.25), transparent 80%) no-repeat;
 	background: linear-gradient(to right, rgba(0,0,0,0.25), transparent 80%) no-repeat;
 	background-size: 100% 1px;
 	background-position: 0 17px;
 }
 h2:first-child { margin-top: 0; }
 h2 ~ *:not(h2) { margin-left: 4px; }
 li { padding: 2px 0; }
 li::before { content: "\00BB\00a0"; }
 li a { position: relative; top: 1px; } /* Center bullet-point arrows */
 /* Button Style */
 .buttons a, button, input, .transparent th a { /* Swapped rgba is shared with input[type='url'] */
 	display: inline-block;
 	color: rgba(32,32,32,0.9);
 	font-weight: bold;
 	text-align: center;
 	cursor: pointer;
 	text-shadow: 0 1px rgba(255,255,255,0.2);
 	line-height: 0.86em;
 	font-size: 1em;
 	padding: 4px 8px;
 	background: #FAFAFA;
 	background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.05), rgba(0,0,0,0.05));
 	background-image: linear-gradient(to bottom, rgba(255,255,255,0.05), rgba(0,0,0,0.05));
 	border: 1px solid rgba(0,0,0,0.25);
 	border-radius: 4px;
 	box-shadow: 0 1px 0 rgba(0,0,0,0.04);
 }
 .buttons { white-space: nowrap; width: 100%; display: table; }
 .buttons33 { white-space: nowrap; width: 33.333%; display: table; text-align: center; margin-left: 33.333% }
 .mini a { width: 50%; }
 a.safe { background-color: rgba(0,220,0,0.5); }
 button.safe { background-color: rgba(0,220,0,0.5); }
 a.warn { background-color: rgba(220,0,0,0.5); }
 .blocked a, .mini a { display: table-cell; }
 .blocked a.safe50 { width: 50%; background-color: rgba(0,220,0,0.5); }
 .blocked a.safe33 { width: 33.333%; background-color: rgba(0,220,0,0.5); }
 /* Types of text */
 .msg { white-space: pre; overflow: auto; -webkit-overflow-scrolling: touch; display: block; line-height: 1.2em; font-weight: bold; font-size: 1.15em; margin: 4px 8px 8px 8px; white-space: pre-line; }
 footer { font-size: 0.8em; text-align: center; width: 87%; margin: 4px auto; }
@@ -0,0 +1,12 @@
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Swap file config
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 CONF_SWAPSIZE=500
@@ -0,0 +1,4 @@
 <html>
 <body>
 </body>
 </html>
@@ -1,183 +0,0 @@
 <?php
 /* Detailed Pi-Hole Block Page: Show "Website Blocked" if user browses to site, but not to image/file requests based on the work of WaLLy3K for DietPi & Pi-Hole */
 $uri = escapeshellcmd($_SERVER['REQUEST_URI']);
 $serverName = escapeshellcmd($_SERVER['SERVER_NAME']);
 // Retrieve server URI extension (EG: jpg, exe, php)
 $uriExt = pathinfo($uri, PATHINFO_EXTENSION);
 // Define which URL extensions get rendered as "Website Blocked"
 $webExt = array('asp', 'htm', 'html', 'php', 'rss', 'xml');
 if(in_array($uriExt, $webExt) || empty($uriExt))
 {
 	// Requested resource has an extension listed in $webExt
 	// or no extension (index access to some folder incl. the root dir)
 	$showPage = true;
 }
 else
 {
 	// Something else
 	$showPage = false;
 }
 // Handle incoming URI types
 if (!$showPage)
 {
 ?>
 <html>
 <head>
 <script>window.close();</script></head>
 <body>
 <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7">
 </body>
 </html>
 <?php
 	die();
 }
 // Get Pi-Hole version
 $piHoleVersion = exec('cd /etc/.pihole/ && git describe --tags --abbrev=0');
 // Don't show the URI if it is the root directory
 if($uri == "/")
 {
 	$uri = "";
 }
 ?>
 <!DOCTYPE html>
 <head>
 	<meta charset='UTF-8'/>
 	<title>Website Blocked</title>
 	<link rel='stylesheet' href='http://pi.hole/pihole/blockingpage.css'/>
 	<link rel='shortcut icon' href='http://pi.hole/admin/img/favicon.png' type='image/png'/>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0,maximum-scale=1.0, user-scalable=no'/>
 	<meta name='robots' content='noindex,nofollow'/>
 </head>
 <body id="body">
 <header>
 	<h1><a href='/'>Website Blocked</a></h1>
 </header>
 <main>
 	<div>Access to the following site has been blocked:<br/>
 	<span class='pre msg'><?php echo $serverName.$uri; ?></span></div>
 	<div>If you have an ongoing use for this website, please ask the owner of the Pi-hole in your network to have it whitelisted.</div>
 	<input id="domain" type="hidden" value="<?php echo $serverName; ?>">
 	<input id="quiet" type="hidden" value="yes">
 	<button id="btnSearch" class="buttons blocked" type="button" style="visibility: hidden;"></button>
 	This page is blocked because it is explicitly contained within the following block list(s):
 	<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre><br/>
 	<div class='buttons blocked'>
 		<a class='safe33' href='javascript:history.back()'>Go back</a>
 		<a class='safe33' id="whitelisting">Whitelist this page</a>
 		<a class='safe33' href='javascript:window.close()'>Close window</a>
 	</div>
 		<div style="width: 98%; text-align: center; padding: 10px;" hidden="true" id="whitelistingform">
 			<p>Note that whitelisting domains which are blocked using the wildcard method won't work.</p>
 			<p>Password required!</p><br/>
 		<form>
 			<input name="list" type="hidden" value="white"><br/>
 			Domain:<br/>
 			<input name="domain" value="<?php echo $serverName ?>" disabled><br/><br/>
 			Password:<br/>
 			<input type="password" id="pw" name="pw"><br/><br/>
 			<button class="buttons33 safe" id="btnAdd" type="button">Whitelist</button>
 		</form><br/>
 		<pre id="whitelistingoutput" style="width: 100%; height: 100%; padding: 5px;" hidden="true"></pre><br/>
 		</div>
 </main>
 <footer>Generated <?php echo date('D g:i A, M d'); ?> by Pi-hole <?php echo $piHoleVersion; ?></footer>
 <script src="http://pi.hole/admin/scripts/vendor/jquery.min.js"></script>
 <script>
 // Create event for when the output is appended to
 (function($) {
    var origAppend = $.fn.append;
    $.fn.append = function () {
        return origAppend.apply(this, arguments).trigger("append");
    };
 })(jQuery);
 </script>
 <script src="http://pi.hole/admin/scripts/pi-hole/js/queryads.js"></script>
 <script>
 function inIframe () {
    try {
        return window.self !== window.top;
    } catch (e) {
        return true;
    }
 }
 // Try to detect if page is loaded within iframe
 if(inIframe())
 {
    // Within iframe
    // hide content of page
    $('#body').hide();
    // remove background
    document.body.style.backgroundImage = "none";
 }
 else
 {
    // Query adlists
    $( "#btnSearch" ).click();
 }
 $( "#whitelisting" ).on( "click", function(){ $( "#whitelistingform" ).removeAttr( "hidden" ); });
 // Remove whitelist functionality if the domain was blocked because of a wildcard
 $( "#output" ).bind("append", function(){
 	if($( "#output" ).contents()[0].data.indexOf("Wildcard blocking") !== -1)
 	{
 		$( "#whitelisting" ).hide();
 		$( "#whitelistingform" ).hide();
 	}
 });
 function add() {
 	var domain = $("#domain");
 	var pw = $("#pw");
 	if(domain.val().length === 0){
 		return;
 	}
 	$.ajax({
 		url: "admin/scripts/pi-hole/php/add.php",
 		method: "post",
 		data: {"domain":domain.val(), "list":"white", "pw":pw.val()},
 		success: function(response) {
 			$( "#whitelistingoutput" ).removeAttr( "hidden" );
 			if(response.indexOf("Pi-hole blocking") !== -1)
 			{
 				// Reload page after 5 seconds
 				setTimeout(function(){window.location.reload(1);}, 5000);
 				$( "#whitelistingoutput" ).html("---> Success <---<br/>You may have to flush your DNS cache");
 			}
 			else
 			{
 				$( "#whitelistingoutput" ).html("---> "+response+" <---");
 			}
 		},
 		error: function(jqXHR, exception) {
 			$( "#whitelistingoutput" ).removeAttr( "hidden" );
 			$( "#whitelistingoutput" ).html("---> Unknown Error <---");
 		}
 	});
 }
 // Handle enter button for adding domains
 $(document).keypress(function(e) {
    if(e.which === 13 && $("#pw").is(":focus")) {
        add();
    }
 });
 // Handle buttons
 $("#btnAdd").on("click", function() {
    add();
 });
 </script>
 </body>
 </html>
@@ -1,43 +1,34 @@
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # lighttpd config for Pi-hole
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation, either version 2 of the License, or
-
+# (at your option) any later version.
 ###############################################################################
 #     FILE AUTOMATICALLY OVERWRITTEN BY PI-HOLE INSTALL/UPDATE PROCEDURE.     #
 # ANY CHANGES MADE TO THIS FILE AFTER INSTALL WILL BE LOST ON THE NEXT UPDATE #
 #                                                                             #
 #              CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE:              #
 #                         /etc/lighttpd/external.conf                         #
 ###############################################################################
 server.modules = (
 	"mod_access",
 	"mod_accesslog",
 	"mod_auth",
 	"mod_expire",
 	"mod_compress",
-	"mod_redirect",
+ 	"mod_redirect",
 	"mod_setenv",
 	"mod_rewrite"
 )
 server.document-root        = "/var/www/html"
-server.error-handler-404    = "pihole/index.php"
+server.error-handler-404	= "pihole/index.html"
 server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
 server.errorlog             = "/var/log/lighttpd/error.log"
 server.pid-file             = "/var/run/lighttpd.pid"
 server.username             = "www-data"
 server.groupname            = "www-data"
 server.port                 = 80
-accesslog.filename          = "/var/log/lighttpd/access.log"
+accesslog.filename			= "/var/log/lighttpd/access.log"
-accesslog.format            = "%{%s}t|%V|%r|%s|%b"
+accesslog.format			= "%{%s}t|%V|%r|%s|%b"
 index-file.names            = ( "index.php", "index.html", "index.lighttpd.html" )
@@ -61,21 +52,10 @@ $HTTP["url"] =~ "^/admin/" {
    )
 }
 # Rewite js requests, must be out of $HTTP block due to bug #2526
 url.rewrite = ( "^(?!/admin/).*\.js$"  => "pihole/index.js"   )
 # If the URL does not start with /admin, then it is a query for an ad domain
 $HTTP["url"] =~ "^(?!/admin)/.*" {
    # Create a response header for debugging using curl -I
    setenv.add-response-header = ( "X-Pi-hole" => "A black hole for Internet advertisements." )
    # rewrite only js requests
    url.rewrite = ("(.*).js" => "pihole/index.js")
 }
 # Entering just "pi.hole" into a browser redirects to "pi.hole/admin/"
 $HTTP["host"] == "pi.hole" {
    $HTTP["url"] == "/" {
        url.redirect = ( "" => "/admin/" )
    }
 }
 # Add user chosen options held in external file
 include_shell "cat external.conf 2>/dev/null"
@@ -1,98 +0,0 @@
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
 #
 # lighttpd config for Pi-hole
 #
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 ###############################################################################
 #     FILE AUTOMATICALLY OVERWRITTEN BY PI-HOLE INSTALL/UPDATE PROCEDURE.     #
 # ANY CHANGES MADE TO THIS FILE AFTER INSTALL WILL BE LOST ON THE NEXT UPDATE #
 #                                                                             #
 #              CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE:              #
 #                         /etc/lighttpd/external.conf                         #
 ###############################################################################
 server.modules = (
 	"mod_access",
 	"mod_auth",
 	"mod_fastcgi",
 	"mod_accesslog",
 	"mod_expire",
 	"mod_compress",
 	"mod_redirect",
 	"mod_setenv",
 	"mod_rewrite"
 )
 server.document-root        = "/var/www/html"
 server.error-handler-404    = "pihole/index.php"
 server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
 server.errorlog             = "/var/log/lighttpd/error.log"
 server.pid-file             = "/var/run/lighttpd.pid"
 server.username             = "lighttpd"
 server.groupname            = "lighttpd"
 server.port                 = 80
 accesslog.filename          = "/var/log/lighttpd/access.log"
 accesslog.format            = "%{%s}t|%V|%r|%s|%b"
 index-file.names            = ( "index.php", "index.html", "index.lighttpd.html" )
 url.access-deny             = ( "~", ".inc" )
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 compress.cache-dir          = "/var/cache/lighttpd/compress/"
 compress.filetype           = ( "application/javascript", "text/css", "text/html", "text/plain" )
 mimetype.assign   = ( ".png"  => "image/png",
                      ".jpg"  => "image/jpeg",
                      ".jpeg" => "image/jpeg",
                      ".html" => "text/html",
                      ".css" => "text/css; charset=utf-8",
                      ".js" => "application/javascript",
                      ".json" => "application/json",
                      ".txt"  => "text/plain",
                      ".svg"  => "image/svg+xml" )
 # default listening port for IPv6 falls back to the IPv4 port
 #include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
 #include_shell "/usr/share/lighttpd/create-mime.assign.pl"
 #include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 fastcgi.server = ( ".php" =>
                   ( "localhost" =>
                     (
                       "socket" => "/tmp/php-fastcgi.socket",
                       "bin-path" => "/usr/bin/php-cgi"
                     )
                   )
                 )
 # If the URL starts with /admin, it is the Web interface
 $HTTP["url"] =~ "^/admin/" {
 	# Create a response header for debugging using curl -I
 	setenv.add-response-header = ( "X-Pi-hole" => "The Pi-hole Web interface is working!" )
 }
 # Rewite js requests, must be out of $HTTP block due to bug #2526
 url.rewrite = ( "^(?!/admin/).*\.js$"  => "pihole/index.js"   )
 # If the URL does not start with /admin, then it is a query for an ad domain
 $HTTP["url"] =~ "^(?!/admin)/.*" {
 	# Create a response header for debugging using curl -I
 	setenv.add-response-header = ( "X-Pi-hole" => "A black hole for Internet advertisements." )
 }
 # Entering just "pi.hole" into a browser redirects to "pi.hole/admin/"
 $HTTP["host"] == "pi.hole" {
    $HTTP["url"] == "/" {
        url.redirect = ( "" => "/admin/" )
    }
 }
 # Add user chosen options held in external file
 include_shell "cat external.conf 2>/dev/null"
@@ -1,10 +0,0 @@
 /var/log/pihole.log {
 	# su #
 	daily
 	copytruncate
 	rotate 5
 	compress
 	delaycompress
 	notifempty
 	nomail
 }
@@ -1,29 +1,30 @@
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Updates ad sources every week
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-#
+# the Free Software Foundation, either version 2 of the License, or
-#
+# (at your option) any later version.
-#
+
-# This file is under source-control of the Pi-hole installation and update
+# Pi-hole: Check if Pi-hole needs to be updated. Check once a week on Monday at 23:58
-# scripts, any changes made to this file will be overwritten when the softare
+#          New releases often come out on Sunday, so checking the next day should be effective.
-# is updated or re-installed. Please make any changes to the appropriate crontab
+#23 58   * * 1   root    /usr/local/bin/updatePihole
 # or other cron file snippets.
 # Pi-hole: Update the ad sources once a week on Sunday at 01:59
 #          Download any updates from the adlists
-59 1    * * 7   root    PATH="$PATH:/usr/local/bin/" pihole updateGravity
+59 1    * * 7   root    /usr/local/bin/pihole updateGravity
-# Pi-hole: Update Pi-hole! Uncomment to enable auto update
+# Pi-hole: Update the Web interface shortly after gravity runs
-#30 2    * * 7   root    PATH="$PATH:/usr/local/bin/" pihole updatePihole
+#          This should also update the version number if it is changed in the dashboard repo
 30 2    * * 7   root    /usr/local/bin/pihole updateDashboard
-# Pi-hole: Flush the log daily at 00:00 so it doesn't get out of control
+# Pi-hole: Parse the log file before it is flushed and save the stats to a database
 #          This will be used for a historical view of your Pi-hole's performance
 #50 23  * * *   root    /usr/local/bin/dailyLog.sh # note: this is outdated
 # Pi-hole: Flush the log daily at 11:58 so it doesn't get out of control
 #          Stats will be viewable in the Web interface thanks to the cron job above
-#          The flush script will use logrotate if available
+58 23   * * *   root    /usr/local/bin/pihole flush
 00 00   * * *   root    PATH="$PATH:/usr/local/bin/" pihole flush
@reboot root /usr/sbin/logrotate /etc/pihole/logrotate
@@ -1,9 +0,0 @@
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
 #
 # Allows the WebUI to use Pi-hole commands
 #
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 #
@@ -1,120 +1,91 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Completely uninstalls Pi-hole
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation, either version 2 of the License, or
-
+# (at your option) any later version.
 # Must be root to uninstall
-if [[ ${EUID} -eq 0 ]]; then
+if [[ $EUID -eq 0 ]];then
 	echo "::: You are root."
 else
 	echo "::: Sudo will be used for the uninstall."
-	# Check if it is actually installed
+  # Check if it is actually installed
-	# If it isn't, exit because the unnstall cannot complete
+  # If it isn't, exit because the unnstall cannot complete
-	if [ -x "$(command -v sudo)" ]; then
+  if [[ $(dpkg-query -s sudo) ]];then
 		export SUDO="sudo"
-	else
+  else
-		echo "::: Please install sudo or run this as root."
+    echo "::: Please install sudo or run this as root."
-		exit 1
+    exit 1
-	fi
+  fi
 fi
-# Compatability
+spinner()
-if [ -x "$(command -v rpm)" ]; then
+{
-	# Fedora Family
+    local pid=$1
-	if [ -x "$(command -v dnf)" ]; then
+    local delay=0.50
-		PKG_MANAGER="dnf"
+    local spinstr='/-\|'
-	else
+    while [ "$(ps a | awk '{print $1}' | grep "$pid")" ]; do
-		PKG_MANAGER="yum"
+        local temp=${spinstr#?}
-	fi
+        printf " [%c]  " "$spinstr"
-	PKG_REMOVE="${PKG_MANAGER} remove -y"
+        local spinstr=$temp${spinstr%"$temp"}
-	PIHOLE_DEPS=( bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common git curl unzip wget findutils )
+        sleep $delay
-	package_check() {
+        printf "\b\b\b\b\b\b"
-		rpm -qa | grep ^$1- > /dev/null
+    done
-	}
+    printf "    \b\b\b\b"
 	package_cleanup() {
 		${SUDO} ${PKG_MANAGER} -y autoremove
 	}
 elif [ -x "$(command -v apt-get)" ]; then
 	# Debian Family
 	PKG_MANAGER="apt-get"
 	PKG_REMOVE="${PKG_MANAGER} -y remove --purge"
 	PIHOLE_DEPS=( dnsutils bc dnsmasq lighttpd php5-common git curl unzip wget )
 	package_check() {
 		dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed"
 	}
 	package_cleanup() {
 		${SUDO} ${PKG_MANAGER} -y autoremove
 		${SUDO} ${PKG_MANAGER} -y autoclean
 	}
 else
 	echo "OS distribution not supported"
 	exit
 fi
 spinner() {
 	local pid=$1
 	local delay=0.50
 	local spinstr='/-\|'
 	while [ "$(ps a | awk '{print $1}' | grep "${pid}")" ]; do
 		local temp=${spinstr#?}
 		printf " [%c]  " "${spinstr}"
 		local spinstr=${temp}${spinstr%"$temp}"}
 		sleep ${delay}
 		printf "\b\b\b\b\b\b"
 	done
 	printf "    \b\b\b\b"
 }
-removeAndPurge() {
+function removeAndPurge {
 	# Purge dependencies
-	echo ":::"
+echo ":::"
-	for i in "${PIHOLE_DEPS[@]}"; do
+	# Nate 3/28/2016 - Removed `php5-cgi` and `php5` as they are removed with php5-common
-		package_check ${i} > /dev/null
+	dependencies=( dnsutils bc dnsmasq lighttpd php5-common git curl unzip wget )
-		if [ $? -eq 0 ]; then
+	for i in "${dependencies[@]}"; do
 		if [ "$(dpkg-query -W --showformat='${Status}\n' "$i" 2> /dev/null | grep -c "ok installed")" -eq 1 ]; then
 			while true; do
-				read -rp "::: Do you wish to remove ${i} from your system? [y/n]: " yn
+				read -rp "::: Do you wish to remove $i from your system? [y/n]: " yn
-				case ${yn} in
+				case $yn in
-					[Yy]* ) printf ":::\tRemoving %s..." "${i}"; ${SUDO} ${PKG_REMOVE} "${i}" &> /dev/null & spinner $!; printf "done!\n"; break;;
+					[Yy]* ) printf ":::\tRemoving %s..." "$i"; $SUDO apt-get -y remove --purge "$i" &> /dev/null & spinner $!; printf "done!\n"; break;;
-					[Nn]* ) printf ":::\tSkipping %s\n" "${i}"; break;;
+					[Nn]* ) printf ":::\tSkipping %s" "$i\n"; break;;
 					* ) printf "::: You must answer yes or no!\n";;
 				esac
 			done
 		else
-			printf ":::\tPackage %s not installed... Not removing.\n" "${i}"
+			printf ":::\tPackage %s not installed... Not removing.\n" "$i"
 		fi
 	done
 	# Remove dependency config files
 	echo "::: Removing dnsmasq config files..."
-	${SUDO} rm /etc/dnsmasq.conf /etc/dnsmasq.conf.orig /etc/dnsmasq.d/01-pihole.conf &> /dev/null
+	$SUDO rm /etc/dnsmasq.conf /etc/dnsmasq.conf.orig /etc/dnsmasq.d/01-pihole.conf &> /dev/null
 	# Take care of any additional package cleaning
-	printf "::: Auto removing & cleaning remaining dependencies..."
+	printf "::: Auto removing remaining dependencies..."
-	package_cleanup &> /dev/null & spinner $!; printf "done!\n";
+	$SUDO apt-get -y autoremove &> /dev/null & spinner $!; printf "done!\n";
 	printf "::: Auto cleaning remaining dependencies..."
 	$SUDO apt-get -y autoclean &> /dev/null & spinner $!; printf "done!\n";
 	# Call removeNoPurge to remove PiHole specific files
 	removeNoPurge
 }
-removeNoPurge() {
+function removeNoPurge {
 	echo ":::"
 	# Only web directories/files that are created by pihole should be removed.
 	echo "::: Removing the Pi-hole Web server files..."
-	${SUDO} rm -rf /var/www/html/admin &> /dev/null
+	$SUDO rm -rf /var/www/html/admin &> /dev/null
-	${SUDO} rm -rf /var/www/html/pihole &> /dev/null
+	$SUDO rm -rf /var/www/html/pihole &> /dev/null
-	${SUDO} rm /var/www/html/index.lighttpd.orig &> /dev/null
+	$SUDO rm /var/www/html/index.lighttpd.orig &> /dev/null
 	# If the web directory is empty after removing these files, then the parent html folder can be removed.
 	if [ -d "/var/www/html" ]; then
 		if [[ ! "$(ls -A /var/www/html)" ]]; then
-    			${SUDO} rm -rf /var/www/html &> /dev/null
+    			$SUDO rm -rf /var/www/html &> /dev/null
 		fi
 	fi
@@ -124,47 +95,39 @@ removeNoPurge() {
 	# preserved.
 	if [[ -f /etc/crontab.orig ]]; then
 		echo "::: Initial Pi-hole cron detected.  Restoring the default system cron..."
-		${SUDO} mv /etc/crontab /etc/crontab.pihole
+		$SUDO mv /etc/crontab /etc/crontab.pihole
-		${SUDO} mv /etc/crontab.orig /etc/crontab
+		$SUDO mv /etc/crontab.orig /etc/crontab
-		${SUDO} service cron restart
+		$SUDO service cron restart
 	fi
 	# Attempt to preserve backwards compatibility with older versions
 	if [[ -f /etc/cron.d/pihole ]];then
 		echo "::: Removing cron.d/pihole..."
-		${SUDO} rm /etc/cron.d/pihole &> /dev/null
+		$SUDO rm /etc/cron.d/pihole &> /dev/null
 	fi
 	echo "::: Removing config files and scripts..."
-	package_check lighttpd > /dev/null
+	if [ ! "$(dpkg-query -W --showformat='${Status}\n' lighttpd 2> /dev/null | grep -c "ok installed")" -eq 1 ]; then
-	if [ $? -eq 1 ]; then
+		$SUDO rm -rf /etc/lighttpd/ &> /dev/null
 		${SUDO} rm -rf /etc/lighttpd/ &> /dev/null
 	else
 		if [ -f /etc/lighttpd/lighttpd.conf.orig ]; then
-			${SUDO} mv /etc/lighttpd/lighttpd.conf.orig /etc/lighttpd/lighttpd.conf
+			$SUDO mv /etc/lighttpd/lighttpd.conf.orig /etc/lighttpd/lighttpd.conf
 		fi
 	fi
-	${SUDO} rm /etc/dnsmasq.d/adList.conf &> /dev/null
+	$SUDO rm /etc/dnsmasq.d/adList.conf &> /dev/null
-	${SUDO} rm /etc/dnsmasq.d/01-pihole.conf &> /dev/null
+	$SUDO rm /etc/dnsmasq.d/01-pihole.conf &> /dev/null
-	${SUDO} rm -rf /var/log/*pihole* &> /dev/null
+	$SUDO rm -rf /var/log/*pihole* &> /dev/null
-	${SUDO} rm -rf /etc/pihole/ &> /dev/null
+	$SUDO rm -rf /etc/pihole/ &> /dev/null
-	${SUDO} rm -rf /etc/.pihole/ &> /dev/null
+	$SUDO rm -rf /etc/.pihole/ &> /dev/null
-	${SUDO} rm -rf /opt/pihole/ &> /dev/null
+	$SUDO rm -rf /opt/pihole/ &> /dev/null
-	${SUDO} rm /usr/local/bin/pihole &> /dev/null
+	$SUDO rm /usr/local/bin/pihole &> /dev/null
-	${SUDO} rm /etc/bash_completion.d/pihole &> /dev/null
+	$SUDO rm /etc/bash_completion.d/pihole
 	${SUDO} rm /etc/sudoers.d/pihole &> /dev/null
 	# If the pihole user exists, then remove
 	if id "pihole" >/dev/null 2>&1; then
        	echo "::: Removing pihole user..."
 		${SUDO} userdel -r pihole
 	fi
 	echo ":::"
 	printf "::: Finished removing PiHole from your system. Sorry to see you go!\n"
 	printf "::: Reach out to us at https://github.com/pi-hole/pi-hole/issues if you need help\n"
-	printf "::: Reinstall by simpling running\n:::\n:::\tcurl -sSL https://install.pi-hole.net | bash\n:::\n::: at any time!\n:::\n"
+	printf "::: Reinstall by simpling running\n:::\n:::\tcurl -L https://install.pi-hole.net | bash\n:::\n::: at any time!\n:::\n"
 	printf "::: PLEASE RESET YOUR DNS ON YOUR ROUTER/CLIENTS TO RESTORE INTERNET CONNECTIVITY!\n"
 }
@@ -173,9 +136,11 @@ echo "::: Preparing to remove packages, be sure that each may be safely removed
 echo "::: (SAFE TO REMOVE ALL ON RASPBIAN)"
 while true; do
 	read -rp "::: Do you wish to purge PiHole's dependencies from your OS? (You will be prompted for each package) [y/n]: " yn
-	case ${yn} in
+	case $yn in
 		[Yy]* ) removeAndPurge; break;;
 		[Nn]* ) removeNoPurge; break;;
 	esac
 done
@@ -1 +0,0 @@
 py.test -v -f test/
@@ -1,139 +1,144 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Compiles a list of ad-serving domains by downloading them from multiple sources
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation, either version 2 of the License, or
-
+# (at your option) any later version.
 # Run this script as root or under sudo
 echo ":::"
-helpFunc() {
+if [[ $EUID -eq 0 ]];then
-	cat << EOM
+	echo "::: You are root."
-::: Pull in domains from adlists
+else
-:::
+	echo "::: sudo will be used."
-::: Usage: pihole -g
+	# Check if it is actually installed
-:::
+	# If it isn't, exit because the install cannot complete
-::: Options:
+	if [[ $(dpkg-query -s sudo) ]];then
-:::  -f, --force			Force lists to be downloaded, even if they don't need updating.
+		export SUDO="sudo"
-:::  -h, --help				Show this help dialog
+	else
-EOM
+		echo "::: Please install sudo or run this script as root."
-	exit 0
+		exit 1
-}
+	fi
 fi
 piholeIPfile=/etc/pihole/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
 adListFile=/etc/pihole/adlists.list
 adListDefault=/etc/pihole/adlists.default
-whitelistScript="pihole -w"
+whitelistScript=/opt/pihole/whitelist.sh
-whitelistFile=/etc/pihole/whitelist.txt
+blacklistScript=/opt/pihole/blacklist.sh
 blacklistFile=/etc/pihole/blacklist.txt
 readonly wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
-#Source the setupVars from install script for the IP
+if [[ -f $piholeIPfile ]];then
-setupVars=/etc/pihole/setupVars.conf
+    # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
-if [[ -f ${setupVars} ]];then
+    piholeIP=$(cat $piholeIPfile)
-	. /etc/pihole/setupVars.conf
+    #rm $piholeIPfile
 else
-	echo "::: WARNING: /etc/pihole/setupVars.conf missing. Possible installation failure."
+    # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
-	echo ":::          Please run 'pihole -r', and choose the 'reconfigure' option to reconfigure."
+    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
-	exit 1
+    piholeIPCIDR=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}')
    piholeIP=${piholeIPCIDR%/*}
 fi
-#Remove the /* from the end of the IPv4addr.
+if [[ -f $piholeIPv6file ]];then
-IPV4_ADDRESS=${IPV4_ADDRESS%/*}
+    # If the file exists, then the user previously chose to use IPv6 in the automated installer
-IPV6_ADDRESS=${IPV6_ADDRESS}
+    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 fi
 # Variables for various stages of downloading and formatting the list
 ## Nate 3/26/2016 - Commented unused variables
 basename=pihole
-piholeDir=/etc/${basename}
+piholeDir=/etc/$basename
-adList=${piholeDir}/gravity.list
+adList=$piholeDir/gravity.list
-localList=${piholeDir}/local.list
+#blacklist=$piholeDir/blacklist.txt
 #whitelist=$piholeDir/whitelist.txt
 #latentWhitelist=$piholeDir/latentWhitelist.txt
 justDomainsExtension=domains
-matterAndLight=${basename}.0.matterandlight.txt
+matterandlight=$basename.0.matterandlight.txt
-supernova=${basename}.1.supernova.txt
+supernova=$basename.1.supernova.txt
-preEventHorizon=list.preEventHorizon
+eventHorizon=$basename.2.eventHorizon.txt
-eventHorizon=${basename}.2.supernova.txt
+accretionDisc=$basename.3.accretionDisc.txt
-accretionDisc=${basename}.3.accretionDisc.txt
+#eyeOfTheNeedle=$basename.4.wormhole.txt
-skipDownload=false
+# After setting defaults, check if there's local overrides
-
+if [[ -r $piholeDir/pihole.conf ]];then
-# Warn users still using pihole.conf that it no longer has any effect (I imagine about 2 people use it)
+    echo "::: Local calibration requested..."
-if [[ -r ${piholeDir}/pihole.conf ]]; then
+        . $piholeDir/pihole.conf
 	echo "::: pihole.conf file no longer supported. Over-rides in this file are ignored."
 fi
 ###########################
 # collapse - begin formation of pihole
-gravity_collapse() {
+function gravity_collapse() {
 	echo "::: Neutrino emissions detected..."
 	echo ":::"
 	#Decide if we're using a custom ad block list, or defaults.
-	if [ -f ${adListFile} ]; then
+	if [ -f $adListFile ]; then
 		#custom file found, use this instead of default
 		echo -n "::: Custom adList file detected. Reading..."
 		sources=()
-		while IFS= read -r line || [[ -n "$line" ]]; do
+		while read -r line; do
 			#Do not read commented out or blank lines
-			if [[ ${line} = \#* ]] || [[ ! ${line} ]]; then
+			if [[ $line = \#* ]] || [[ ! $line ]]; then
 				echo "" > /dev/null
 			else
-				sources+=(${line})
+				sources+=($line)
 			fi
-		done < ${adListFile}
+		done < $adListFile
 		echo " done!"
 	else
 		#no custom file found, use defaults!
 		echo -n "::: No custom adlist file detected, reading from default file..."
 		sources=()
-		while IFS= read -r line || [[ -n "$line" ]]; do
+		while read -r line; do
 			#Do not read commented out or blank lines
-			if [[ ${line} = \#* ]] || [[ ! ${line} ]]; then
+			if [[ $line = \#* ]] || [[ ! $line ]]; then
 				echo "" > /dev/null
 			else
-				sources+=(${line})
+				sources+=($line)
 			fi
-		done < ${adListDefault}
+		done < $adListDefault
 		echo " done!"
 	fi
 	# Create the pihole resource directory if it doesn't exist.  Future files will be stored here
 	if [[ -d $piholeDir ]];then
        # Temporary hack to allow non-root access to pihole directory
        # Will update later, needed for existing installs, new installs should
        # create this directory as non-root
        $SUDO chmod 777 $piholeDir
        echo ":::"
        echo "::: Existing pihole directory found"
 	else
        echo "::: Creating pihole directory..."
        mkdir $piholeDir
        $SUDO chmod 777 $piholeDir
 	fi
 }
 # patternCheck - check to see if curl downloaded any new files.
-gravity_patternCheck() {
+function gravity_patternCheck() {
 	patternBuffer=$1
-	success=$2
+	# check if the patternbuffer is a non-zero length file
-	error=$3
+	if [[ -s "$patternBuffer" ]];then
-	if [ $success = true ]; then
+		# Some of the blocklists are copyright, they need to be downloaded
-		# check if download was successful but list has not been modified
+		# and stored as is. They can be processed for content after they
-		if [ "${error}" == "304" ]; then
+		# have been saved.
-			echo ":::   No changes detected, transport skipped!"
+		cp "$patternBuffer" "$saveLocation"
-		# check if the patternbuffer is a non-zero length file
+		echo " List updated, transport successful!"
 		elif [[ -s "${patternBuffer}" ]]; then
 			# Some of the blocklists are copyright, they need to be downloaded
 			# and stored as is. They can be processed for content after they
 			# have been saved.
 			mv "${patternBuffer}" "${saveLocation}"
 			echo ":::   List updated, transport successful!"
 		else
 			# Empty file -> use previously downloaded list
 			echo ":::   Received empty file, using cached one (list not updated!)"
 		fi
 	else
-		# check if cached list exists
+		# curl didn't download any host files, probably because of the date check
-		if [[ -r "${saveLocation}" ]]; then
+		echo " No changes detected, transport skipped!"
 			echo ":::   List download failed, using cached list (list not updated!)"
 		else
 			echo ":::   Download failed and no cached list available (list will not be considered)"
 		fi
 	fi
 }
 # transport - curl the specified url with any needed command extentions
-gravity_transport() {
+function gravity_transport() {
 	url=$1
 	cmd_ext=$2
 	agent=$3
@@ -141,238 +146,163 @@ gravity_transport() {
 	# tmp file, so we don't have to store the (long!) lists in RAM
 	patternBuffer=$(mktemp)
 	heisenbergCompensator=""
-	if [[ -r ${saveLocation} ]]; then
+	if [[ -r $saveLocation ]]; then
 		# if domain has been saved, add file for date check to only download newer
-		heisenbergCompensator="-z ${saveLocation}"
+		heisenbergCompensator="-z $saveLocation"
 	fi
 	# Silently curl url
-	err=$(curl -s -L ${cmd_ext} ${heisenbergCompensator} -w %{http_code} -A "${agent}" ${url} -o ${patternBuffer})
+	curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
-
+	# Check for list updates
-	echo " done"
+	gravity_patternCheck "$patternBuffer"
-	# Analyze http response
+	# Cleanup
-	echo -n ":::   Status: "
+	rm -f "$patternBuffer"
 	case "$err" in
 		"200"  ) echo "Success (OK)"; success=true;;
 		"304"  ) echo "Not modified"; success=true;;
 		"403"  ) echo "Forbidden"; success=false;;
 		"404"  ) echo "Not found"; success=false;;
 		"408"  ) echo "Time-out"; success=false;;
 		"451"  ) echo "Unavailable For Legal Reasons"; success=false;;
 		"521"  ) echo "Web Server Is Down (Cloudflare)"; success=false;;
 		"522"  ) echo "Connection Timed Out (Cloudflare)"; success=false;;
 		"500"  ) echo "Internal Server Error"; success=false;;
 		*      ) echo "Status $err"; success=false;;
 	esac
 	# Process result
 	gravity_patternCheck "${patternBuffer}" ${success} "${err}"
 }
 # spinup - main gravity function
-gravity_spinup() {
+function gravity_spinup() {
 	echo ":::"
 	# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and	 		# blank lines
-	for ((i = 0; i < "${#sources[@]}"; i++)); do
+	for ((i = 0; i < "${#sources[@]}"; i++))
-		url=${sources[$i]}
+	do
-		# Get just the domain from the URL
+        url=${sources[$i]}
-		domain=$(echo "${url}" | cut -d'/' -f3)
+        # Get just the domain from the URL
        domain=$(echo "$url" | cut -d'/' -f3)
-		# Save the file as list.#.domain
+        # Save the file as list.#.domain
-		saveLocation=${piholeDir}/list.${i}.${domain}.${justDomainsExtension}
+        saveLocation=$piholeDir/list.$i.$domain.$justDomainsExtension
-		activeDomains[$i]=${saveLocation}
+        activeDomains[$i]=$saveLocation
-		agent="Mozilla/10.0"
+        agent="Mozilla/10.0"
-		# Use a case statement to download lists that need special cURL commands
+        echo -n "::: Getting $domain list..."
 		# to complete properly and reset the user agent when required
 		case "${domain}" in
 			"adblock.mahakala.is")
 			agent='Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
 			cmd_ext="-e http://forum.xda-developers.com/"
 		    ;;
-		    "pgl.yoyo.org")
+        # Use a case statement to download lists that need special cURL commands
-			cmd_ext="-d mimetype=plaintext -d hostformat=hosts"
+        # to complete properly and reset the user agent when required
-		    ;;
+        case "$domain" in
            "adblock.mahakala.is")
                agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
                cmd_ext="-e http://forum.xda-developers.com/"
            ;;
            "pgl.yoyo.org")
                cmd_ext="-d mimetype=plaintext -d hostformat=hosts"
            ;;
            # Default is a simple request
            *) cmd_ext=""
        esac
-        if [[ "${skipDownload}" == false ]]; then
+        gravity_transport "$url" "$cmd_ext" "$agent"
            echo -n "::: Getting $domain list..."
            gravity_transport "$url" "$cmd_ext" "$agent"
        fi
 	done
 }
 # Schwarzchild - aggregate domains to one list and add blacklisted domains
-gravity_Schwarzchild() {
+function gravity_Schwarzchild() {
 	echo "::: "
 	# Find all active domains and compile them into one file and remove CRs
 	echo -n "::: Aggregating list of domains..."
-	truncate -s 0 ${piholeDir}/${matterAndLight}
+	truncate -s 0 $piholeDir/$matterandlight
-	for i in "${activeDomains[@]}"; do
+	for i in "${activeDomains[@]}"
-		# Only assimilate list if it is available (download might have faild permanently)
+	do
-		if [[ -r "${i}" ]]; then
+		cat "$i" | tr -d '\r' >> $piholeDir/$matterandlight
 			cat "${i}" | tr -d '\r' >> ${piholeDir}/${matterAndLight}
 		fi
 	done
 	echo " done!"
 }
-gravity_Blacklist() {
+function gravity_Blacklist(){
-	# Append blacklist entries to eventHorizon if they exist
+	# Append blacklist entries if they exist
-	if [[ -f "${blacklistFile}" ]]; then
+	echo -n "::: Running blacklist script to update HOSTS file...."
-	    numBlacklisted=$(wc -l < "${blacklistFile}")
+	$blacklistScript -f -nr -q > /dev/null
 	    plural=; [[ "$numBlacklisted" != "1" ]] && plural=s
 	    echo -n "::: Blacklisting $numBlacklisted domain${plural}..."
 	    cat ${blacklistFile} >> ${piholeDir}/${eventHorizon}
 	    echo " done!"
 	else
 	    echo "::: Nothing to blacklist!"
 	fi
 	numBlacklisted=$(wc -l < "/etc/pihole/blacklist.txt")
 	plural=; [[ "$numBlacklisted" != "1" ]] && plural=s
 	echo " $numBlacklisted domain${plural} blacklisted!"
 }
-gravity_Wildcard() {
+function gravity_Whitelist() {
 	# Return number of wildcards in output - don't actually handle wildcards
 	if [[ -f "${wildcardlist}" ]]; then
 	    numWildcards=$(grep -c ^ "${wildcardlist}")
 	    if [[ -n "${IPV4_ADDRESS}" && -n "${IPV6_ADDRESS}" ]];then
 	        let numWildcards/=2
 	    fi
 	    plural=; [[ "$numWildcards" != "1" ]] && plural=s
 	    echo "::: Wildcard blocked domain${plural}: $numWildcards"
 	else
 	    echo "::: No wildcards used!"
 	fi
 }
 gravity_Whitelist() {
    #${piholeDir}/${eventHorizon})
 	echo ":::"
 	# Prevent our sources from being pulled into the hole
 	plural=; [[ "${sources[@]}" != "1" ]] && plural=s
-	echo -n "::: Adding adlist source${plural} to the whitelist..."
+	echo -n "::: Adding ${#sources[@]} adlist source${plural} to the whitelist..."
 	urls=()
-	for url in "${sources[@]}"; do
+	for url in "${sources[@]}"
-		tmp=$(echo "${url}" | awk -F '/' '{print $3}')
+	do
-		urls=("${urls[@]}" ${tmp})
+        tmp=$(echo "$url" | awk -F '/' '{print $3}')
        urls=("${urls[@]}" $tmp)
 	done
 	echo " done!"
-	# Ensure adlist domains are in whitelist.txt
+	echo -n "::: Running whitelist script to update HOSTS file...."
-	${whitelistScript} -nr -q "${urls[@]}" > /dev/null
+	$whitelistScript -f -nr -q "${urls[@]}" > /dev/null
-
+	numWhitelisted=$(wc -l < "/etc/pihole/whitelist.txt")
-    # Check whitelist.txt exists.
+	plural=; [[ "$numWhitelisted" != "1" ]] && plural=s
-	if [[ -f "${whitelistFile}" ]]; then
+	echo " $numWhitelisted domain${plural} whitelisted!"
        # Remove anything in whitelist.txt from the Event Horizon
        numWhitelisted=$(wc -l < "${whitelistFile}")
        plural=; [[ "$numWhitelisted" != "1" ]] && plural=s
        echo -n "::: Whitelisting $numWhitelisted domain${plural}..."
        #print everything from preEventHorizon into eventHorizon EXCEPT domains in whitelist.txt
        grep -F -x -v -f ${whitelistFile} ${piholeDir}/${preEventHorizon} > ${piholeDir}/${eventHorizon}
        echo " done!"
 	else
 	    echo "::: Nothing to whitelist!"
 	fi
 }
-gravity_unique() {
+function gravity_unique() {
 	# Sort and remove duplicates
 	echo -n "::: Removing duplicate domains...."
-	sort -u  ${piholeDir}/${supernova} > ${piholeDir}/${preEventHorizon}
+	sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
 	echo " done!"
-	numberOf=$(wc -l < ${piholeDir}/${preEventHorizon})
+	numberOf=$(wc -l < $piholeDir/$eventHorizon)
 	echo "::: $numberOf unique domains trapped in the event horizon."
 }
-gravity_hostFormat() {
+function gravity_hostFormat() {
 	# Format domain list as "192.168.x.x domain.com"
-	echo -n "::: Formatting domains into a HOSTS file..."
+	echo "::: Formatting domains into a HOSTS file..."
-
+	hostname=$(</etc/hostname)
-	if [[ -f /etc/hostname ]]; then
+	# If there is a value in the $piholeIPv6, then IPv6 will be used, so the awk command modified to create a line for both protocols
-		hostname=$(</etc/hostname)
+	if [[ -n $piholeIPv6 ]];then
-	elif [ -x "$(command -v hostname)" ]; then
+		# Add hostname and dummy domain to the top of gravity.list to make ping result return a friendlier looking domain! Also allows for an easy way to access the Pi-hole admin console (pi.hole/admin)
-		hostname=$(hostname -f)
+		echo -e "$piholeIP $hostname\n$piholeIPv6 $hostname\n$piholeIP pi.hole\n$piholeIPv6 pi.hole" > $piholeDir/$accretionDisc
 		cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $piholeDir/$accretionDisc
 	else
-		echo "::: Error: Unable to determine fully qualified domain name of host"
+		# Otherwise, just create gravity.list as normal using IPv4
 		# Add hostname and dummy domain to the top of gravity.list to make ping result return a friendlier looking domain! Also allows for an easy way to access the Pi-hole admin console (pi.hole/admin)
 		echo -e "$piholeIP $hostname\n$piholeIP pi.hole" > $piholeDir/$accretionDisc
 		cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >> $piholeDir/$accretionDisc
 	fi
  # Check vars from setupVars.conf to see if we're using IPv4, IPv6, Or both.
  if [[ -n "${IPV4_ADDRESS}" && -n "${IPV6_ADDRESS}" ]];then
      echo -e "${IPV4_ADDRESS} ${hostname}\n${IPV6_ADDRESS} ${hostname}\n${IPV4_ADDRESS} pi.hole\n${IPV6_ADDRESS} pi.hole" > ${localList}
      # Both IPv4 and IPv6
      cat ${piholeDir}/${eventHorizon} | awk -v ipv4addr="$IPV4_ADDRESS" -v ipv6addr="$IPV6_ADDRESS" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${piholeDir}/${accretionDisc}
  elif [[ -n "${IPV4_ADDRESS}" && -z "${IPV6_ADDRESS}" ]];then
      echo -e "${IPV4_ADDRESS} ${hostname}\n${IPV4_ADDRESS} pi.hole" > ${localList}
      # Only IPv4
      cat ${piholeDir}/${eventHorizon} | awk -v ipv4addr="$IPV4_ADDRESS" '{sub(/\r$/,""); print ipv4addr" "$0}' >> ${piholeDir}/${accretionDisc}
  elif [[ -z "${IPV4_ADDRESS}" && -n "${IPV6_ADDRESS}" ]];then
      echo -e "${IPV6_ADDRESS} ${hostname}\n${IPV6_ADDRESS} pi.hole" > ${localList}
      # Only IPv6
      cat ${piholeDir}/${eventHorizon} | awk -v ipv6addr="$IPV6_ADDRESS" '{sub(/\r$/,""); print ipv6addr" "$0}' >> ${piholeDir}/${accretionDisc}
  elif [[ -z "${IPV4_ADDRESS}" && -z "${IPV6_ADDRESS}" ]];then
      echo "::: No IP Values found! Please run 'pihole -r' and choose reconfigure to restore values"
      exit 1
  fi
 	# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
-	cp ${piholeDir}/${accretionDisc} ${adList}
+	cp $piholeDir/$accretionDisc $adList
 	echo " done!"
 }
 # blackbody - remove any remnant files from script processes
-gravity_blackbody() {
+function gravity_blackbody() {
 	# Loop through list files
-	for file in ${piholeDir}/*.${justDomainsExtension}; do
+	for file in $piholeDir/*.$justDomainsExtension
 	do
 		# If list is in active array then leave it (noop) else rm the list
 		if [[ " ${activeDomains[@]} " =~ ${file} ]]; then
 			:
 		else
-			rm -f "${file}"
+			rm -f "$file"
 		fi
 	done
 }
-gravity_advanced() {
+function gravity_advanced() {
 	# Remove comments and print only the domain name
 	# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
 	# This helps with that and makes it easier to read
 	# It also helps with debugging so each stage of the script can be researched more in depth
 	echo -n "::: Formatting list of domains to remove comments...."
-	#awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' ${piholeDir}/${matterAndLight} | sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  ${piholeDir}/${supernova}
+	awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$matterandlight | sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
 	#Above line does not correctly grab domains where comment is on the same line (e.g 'addomain.com #comment')
 	#Awk -F splits on given IFS, we grab the right hand side (chops trailing #coments and /'s to grab the domain only.
 	#Last awk command takes non-commented lines and if they have 2 fields, take the left field (the domain) and leave
 	#+ the right (IP address), otherwise grab the single field.
 	cat ${piholeDir}/${matterAndLight} | \
 	    awk -F '#' '{print $1}' | \
 	    awk -F '/' '{print $1}' | \
 	    awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | \
 	    sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  ${piholeDir}/${supernova}
 	echo " done!"
-	numberOf=$(wc -l < ${piholeDir}/${supernova})
+	numberOf=$(wc -l < $piholeDir/$supernova)
-	echo "::: ${numberOf} domains being pulled in by gravity..."
+	echo "::: $numberOf domains being pulled in by gravity..."
 	gravity_unique
 }
-gravity_reload() {
+function gravity_reload() {
 	#Clear no longer needed files...
 	echo ":::"
 	echo -n "::: Cleaning up un-needed files..."
-	rm ${piholeDir}/pihole.*.txt
+	$SUDO rm $piholeDir/pihole.*.txt
 	echo " done!"
 	# Reload hosts file
@@ -383,44 +313,28 @@ gravity_reload() {
 	#First escape forward slashes in the path:
 	adList=${adList//\//\\\/}
 	#Now replace the line in dnsmasq file
-#	sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
+	$SUDO sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
 	dnsmasqPid=$(pidof dnsmasq)
-	pihole restartdns
+    find "$piholeDir" -type f -exec $SUDO chmod 666 {} \;
 	if [[ $dnsmasqPid ]]; then
 		# service already running - reload config
 		$SUDO killall -s HUP dnsmasq
 	else
 		# service not running, start it up
 		$SUDO service dnsmasq start
 	fi
 	echo " done!"
 }
-for var in "$@"; do
+$SUDO cp /etc/.pihole/adlists.default /etc/pihole/adlists.default
 	case "${var}" in
 		"-f" | "--force"     ) forceGrav=true;;
 		"-h" | "--help"      ) helpFunc;;
 		"-sd" | "--skip-download"    ) skipDownload=true;;
 	esac
 done
 if [[ "${forceGrav}" == true ]]; then
 	echo -n "::: Deleting exising list cache..."
 	rm /etc/pihole/list.*
 	echo " done!"
 fi
 #Overwrite adlists.default from /etc/.pihole in case any changes have been made. Changes should be saved in /etc/adlists.list
 cp /etc/.pihole/adlists.default /etc/pihole/adlists.default
 gravity_collapse
 gravity_spinup
-if [[ "${skipDownload}" == false ]]; then
+gravity_Schwarzchild
-    gravity_Schwarzchild
+gravity_advanced
    gravity_advanced
 else
    echo "::: Using cached Event Horizon list..."
    numberOf=$(wc -l < ${piholeDir}/${preEventHorizon})
 	echo "::: $numberOf unique domains trapped in the event horizon."
 fi
 gravity_Whitelist
 gravity_Blacklist
 gravity_Wildcard
 gravity_hostFormat
 gravity_blackbody
-
+gravity_Whitelist
 gravity_Blacklist
 gravity_reload
 pihole status
@@ -1,345 +1,121 @@
 #!/bin/bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your own hardware.
+# Network-wide ad blocking via your Raspberry Pi
-#
+# http://pi-hole.net
 # Controller for all pihole scripts and functions.
 #
-# This file is copyright under the latest version of the EUPL.
+# Pi-hole is free software: you can redistribute it and/or modify
-# Please see LICENSE file for your rights under this license.
+# it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 PI_HOLE_SCRIPT_DIR="/opt/pihole"
 readonly wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
 # Must be root to use this tool
 if [[ ! $EUID -eq 0 ]];then
-  if [ -x "$(command -v sudo)" ];then
+	#echo "::: You are root."
-    exec sudo bash "$0" "$@"
+#else
-    exit $?
+	#echo "::: Sudo will be used for this tool."
  # Check if it is actually installed
  # If it isn't, exit because the pihole cannot be invoked without privileges.
  if [[ $(dpkg-query -s sudo) ]];then
 		export SUDO="sudo"
  else
-    echo "::: sudo is needed to run pihole commands.  Please run this script as root or install sudo."
+    echo "::: Please install sudo or run this as root."
    exit 1
  fi
 fi
-webpageFunc() {
+function whitelistFunc {
-  source /opt/pihole/webpage.sh
+	shift
-  main "$@"
+	$SUDO /opt/pihole/whitelist.sh "$@"
-  exit 0
+	exit 1
 }
-whitelistFunc() {
+function blacklistFunc {
- "${PI_HOLE_SCRIPT_DIR}"/list.sh "$@"
+	shift
-  exit 0
+	$SUDO /opt/pihole/blacklist.sh "$@"
 	exit 1
 }
-blacklistFunc() {
+function debugFunc {
-  "${PI_HOLE_SCRIPT_DIR}"/list.sh "$@"
+	$SUDO /opt/pihole/piholeDebug.sh
-  exit 0
+	exit 1
 }
-wildcardFunc() {
+function flushFunc {
-  "${PI_HOLE_SCRIPT_DIR}"/list.sh "$@"
+	$SUDO /opt/pihole/piholeLogFlush.sh
-  exit 0
+	exit 1
 }
-debugFunc() {
+function updateDashboardFunc {
-  local automated
+	$SUDO /opt/pihole/updateDashboard.sh
-  local web
+	exit 1
  # Pull off the `debug` leaving passed call augmentation flags in $1
  shift
  if [[ "$@" == *"-a"* ]]; then
    automated="true"
  fi
  if [[ "$@" == *"-w"* ]]; then
    web="true"
  fi
  AUTOMATED=${automated:-} WEBCALL=${web:-} "${PI_HOLE_SCRIPT_DIR}"/piholeDebug.sh
  exit 0
 }
-flushFunc() {
+function updateGravityFunc {
-  "${PI_HOLE_SCRIPT_DIR}"/piholeLogFlush.sh
+	$SUDO /opt/pihole/gravity.sh
-  exit 0
+	exit 1
 }
-updatePiholeFunc() {
+function updatePiholeFunc {
-  "${PI_HOLE_SCRIPT_DIR}"/update.sh
+	$SUDO /opt/pihole/updatePihole.sh
-  exit 0
+	exit 1
 }
-reconfigurePiholeFunc() {
+function setupLCDFunction {
-  /etc/.pihole/automated\ install/basic-install.sh --reconfigure
+	$SUDO /opt/pihole/setupLCD.sh
-  exit 0;
+	exit 1
 }
-updateGravityFunc() {
+function chronometerFunc {
-  "${PI_HOLE_SCRIPT_DIR}"/gravity.sh "$@"
+	shift
-  exit 0
+	$SUDO /opt/pihole/chronometer.sh "$@"
-}
+	exit 1
 scanList(){
  domain="${1}"
  list="${2}"
  method="${3}"
  if [[ ${method} == "-exact" ]] ; then
    grep -i -E "(^|\s)${domain}($|\s)" "${list}"
  else
    grep -i "${domain}" "${list}"
  fi
 }
 processWildcards() {
  IFS="." read -r -a array <<< "${1}"
  for (( i=${#array[@]}-1; i>=0; i-- )); do
    ar=""
    for (( j=${#array[@]}-1; j>${#array[@]}-i-2; j-- )); do
      if [[ $j == $((${#array[@]}-1)) ]]; then
        ar="${array[$j]}"
      else
        ar="${array[$j]}.${ar}"
      fi
    done
    echo "${ar}"
  done
 }
 queryFunc() {
  domain="${2}"
  method="${3}"
  lists=( /etc/pihole/list.* /etc/pihole/blacklist.txt)
  for list in ${lists[@]}; do
    if [ -e "${list}" ]; then
      result=$(scanList ${domain} ${list} ${method})
      # Remove empty lines before couting number of results
      count=$(sed '/^\s*$/d' <<< "$result" | wc -l)
      echo "::: ${list} (${count} results)"
      if [[ ${count} > 0 ]]; then
        echo "${result}"
      fi
      echo ""
    else
      echo "::: ${list} does not exist"
      echo ""
    fi
  done
  # Scan for possible wildcard matches
  local wildcards=($(processWildcards "${domain}"))
  for domain in ${wildcards[@]}; do
    result=$(scanList "\/${domain}\/" ${wildcardlist})
    # Remove empty lines before couting number of results
    count=$(sed '/^\s*$/d' <<< "$result" | wc -l)
    if [[ ${count} > 0 ]]; then
      echo "::: Wildcard blocking ${domain} (${count} results)"
      echo "${result}"
      echo ""
    fi
  done
  exit 0
 }
 chronometerFunc() {
  shift
  "${PI_HOLE_SCRIPT_DIR}"/chronometer.sh "$@"
  exit 0
 }
-uninstallFunc() {
+function uninstallFunc {
-  "${PI_HOLE_SCRIPT_DIR}"/uninstall.sh
+	$SUDO /opt/pihole/uninstall.sh
-  exit 0
+	exit 1
 }
-versionFunc() {
+function helpFunc {
-  shift
+    echo "::: Control all PiHole specific functions!"
-  "${PI_HOLE_SCRIPT_DIR}"/version.sh "$@"
+    echo ":::"
-  exit 0
+    echo "::: Usage: pihole [options]"
-}
+    printf ":::\tAdd -h after -w (whitelist), -b (blacklist), or -c (chronometer)  for more information on usage\n"
-
+    echo ":::"
-restartDNS() {
+    echo "::: Options:"
-  dnsmasqPid=$(pidof dnsmasq)
+    echo ":::  -w, whitelist 			Whitelist domains"
-  if [[ ${dnsmasqPid} ]]; then
+    echo ":::  -b, blacklist 			Blacklist domains"
-    # service already running - reload config
+    echo ":::  -d, debug 				Start a debugging session if having trouble"
-    if [ -x "$(command -v systemctl)" ]; then
+    echo ":::  -f, flush 				Flush the pihole.log file"
-      systemctl restart dnsmasq
+    echo ":::  -u, updateDashboard		Update the web dashboard manually"
-    else
+    echo ":::  -up, updatePihole		Update the Pi-hole core files manually"
-      service dnsmasq restart
+    echo ":::  -g, updateGravity		Update the list of ad-serving domains"
-    fi
+   	echo ":::  -s, setupLCD 			Automatically configures the Pi to use the 2.8 LCD screen to display stats on it"
-  else
+	echo ":::  -c, chronometer 			Calculates stats and displays to an LCD"
-    # service not running, start it up
+	echo ":::  -h, help 				Show this help dialog"
-    if [ -x "$(command -v systemctl)" ]; then
+	echo ":::  uninstall				Uninstall Pi-Hole from your system!"
-      systemctl start dnsmasq
+	exit 1
    else
      service dnsmasq start
    fi
  fi
 }
 piholeEnable() {
  if [[ "${1}" == "0" ]] ; then
    #Disable Pihole
    sed -i 's/^addn-hosts=\/etc\/pihole\/gravity.list/#addn-hosts=\/etc\/pihole\/gravity.list/' /etc/dnsmasq.d/01-pihole.conf
    echo "::: Blocking has been disabled!"
    if [[ $# > 1 ]] ; then
      if [[ ${2} == *"s"* ]] ; then
        tt=${2%"s"}
        echo "::: Blocking will be re-enabled in ${tt} seconds"
        nohup bash -c "sleep ${tt}; pihole enable" </dev/null &>/dev/null &
      elif [[ ${2} == *"m"* ]] ; then
        tt=${2%"m"}
        echo "::: Blocking will be re-enabled in ${tt} minutes"
        tt=$((${tt}*60))
        nohup bash -c "sleep ${tt}; pihole enable" </dev/null &>/dev/null &
      else
        echo "::: Unknown format for delayed reactivation of the blocking!"
        echo "::: Example:"
        echo ":::    pihole disable 5s    -    will disable blocking for 5 seconds"
        echo ":::    pihole disable 7m    -    will disable blocking for 7 minutes"
        echo "::: Blocking will not automatically be re-enabled!"
      fi
    fi
  else
    #Enable pihole
    echo "::: Blocking has been enabled!"
    sed -i 's/^#addn-hosts/addn-hosts/' /etc/dnsmasq.d/01-pihole.conf
  fi
  restartDNS
 }
 piholeLogging() {
  shift
  if [[ "${1}" == "off" ]] ; then
    #Disable Logging
    sed -i 's/^log-queries/#log-queries/' /etc/dnsmasq.d/01-pihole.conf
    sed -i 's/^QUERY_LOGGING=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf
    pihole -f
    echo "::: Logging has been disabled!"
  elif [[ "${1}" == "on" ]] ; then
    #Enable logging
    sed -i 's/^#log-queries/log-queries/' /etc/dnsmasq.d/01-pihole.conf
    sed -i 's/^QUERY_LOGGING=false/QUERY_LOGGING=true/' /etc/pihole/setupVars.conf
    echo "::: Logging has been enabled!"
  else
    echo "::: Invalid option passed, please pass 'on' or 'off'"
    exit 1
  fi
  restartDNS
 }
 piholeStatus() {
  if [[ $(netstat -plnt | grep -c ':53 ') > 0 ]]; then
    if [[ "${1}" != "web" ]] ; then
      echo "::: DNS service is running"
    fi
  else
    if [[ "${1}" == "web" ]] ; then
      echo "-1";
    else
      echo "::: DNS service is NOT running"
    fi
    return
  fi
  if [[ $(grep -i "^#addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf) ]] ; then
    #list is commented out
    if [[ "${1}" == "web" ]] ; then
      echo 0;
    else
      echo "::: Pi-hole blocking is Disabled";
    fi
  elif [[ $(grep -i "^addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf) ]] ; then
    #list set
    if [[ "${1}" == "web" ]] ; then
      echo 1;
    else
      echo "::: Pi-hole blocking is Enabled";
    fi
  else
    #addn-host not found
    if [[ "${1}" == "web" ]] ; then
      echo 99
    else
      echo ":::  No hosts file linked to dnsmasq, adding it in enabled state"
    fi
    #add addn-host= to dnsmasq
    echo "addn-hosts=/etc/pihole/gravity.list" >> /etc/dnsmasq.d/01-pihole.conf
    restartDNS
  fi
 }
 tailFunc() {
  echo "Press Ctrl-C to exit"
  tail -F /var/log/pihole.log
  exit 0
 }
 helpFunc() {
 	cat << EOM
 ::: Control all PiHole specific functions!
 :::
 ::: Usage: pihole [options]
 :::		Add -h after -w (whitelist), -b (blacklist), -c (chronometer), or -a (admin)  for more information on usage
 :::
 ::: Options:
 :::  -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
 :::                             Automated debugging can be enabled with `-a`.
 :::                             'pihole -d -a'
 :::  -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 installed versions of Pi-Hole and Web-Admin
 :::  -q, query                Query the adlists for a specific domain
 :::                             'pihole -q domain -exact' shows 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 :(!
 :::  status                   Is Pi-Hole Enabled or Disabled
 :::  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
 :::  restartdns               Restart dnsmasq
 EOM
  exit 0
 }
 if [[ $# = 0 ]]; then
-  helpFunc
+	helpFunc
 fi
 # Handle redirecting to specific functions based on arguments
-case "${1}" in
+case "$1" in
-  "-w" | "whitelist"            ) whitelistFunc "$@";;
+"-w" | "whitelist"			) whitelistFunc "$@";;
-  "-b" | "blacklist"            ) blacklistFunc "$@";;
+"-b" | "blacklist"			) blacklistFunc "$@";;
-  "-wild" | "wildcard"          ) wildcardFunc "$@";;
+"-d" | "debug"				) debugFunc;;
-  "-d" | "debug"                ) debugFunc "$@";;
+"-f" | "flush"				) flushFunc;;
-  "-f" | "flush"                ) flushFunc;;
+"-u" | "updateDashboard"	) updateDashboardFunc;;
-  "-up" | "updatePihole"        ) updatePiholeFunc;;
+"-up" | "updatePihole"		) updatePiholeFunc;;
-  "-r"  | "reconfigure"         ) reconfigurePiholeFunc;;
+"-g" | "updateGravity"		) updateGravityFunc;;
-  "-g" | "updateGravity"        ) updateGravityFunc "$@";;
+"-s" | "setupLCD"			) setupLCDFunction;;
-  "-c" | "chronometer"          ) chronometerFunc "$@";;
+"-c" | "chronometer"		) chronometerFunc "$@";;
-  "-h" | "help"                 ) helpFunc;;
+"-h" | "help"				) helpFunc;;
-  "-v" | "version"              ) versionFunc "$@";;
+"uninstall"					) uninstallFunc;;
-  "-q" | "query"                ) queryFunc "$@";;
+*                    		) helpFunc;;
  "-l" | "logging"              ) piholeLogging "$@";;
  "uninstall"                   ) uninstallFunc;;
  "enable"                      ) piholeEnable 1;;
  "disable"                     ) piholeEnable 0 $2;;
  "status"                      ) piholeStatus "$2";;
  "restartdns"                  ) restartDNS;;
  "-a" | "admin"                ) webpageFunc "$@";;
  "-t" | "tail"                 ) tailFunc;;
  *                             ) helpFunc;;
 esac
@@ -1,5 +0,0 @@
 docker-compose
 pytest
 pytest-xdist
 pytest-cov
 testinfra
@@ -1,16 +0,0 @@
 FROM centos:7
 ENV GITDIR /etc/.pihole
 ENV SCRIPTDIR /opt/pihole
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 RUN true && \
    chmod +x $SCRIPTDIR/*
 ENV PH_TEST true
 #sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
@@ -1,61 +0,0 @@
 import pytest
 import testinfra
 check_output = testinfra.get_backend(
    "local://"
 ).get_module("Command").check_output
@pytest.fixture
 def Pihole(Docker):
    ''' used to contain some script stubbing, now pretty much an alias.
    Also provides bash as the default run function shell '''
    def run_bash(self, command, *args, **kwargs):
        cmd = self.get_command(command, *args)
        if self.user is not None:
            out = self.run_local(
                "docker exec -u %s %s /bin/bash -c %s",
                self.user, self.name, cmd)
        else:
            out = self.run_local(
                "docker exec %s /bin/bash -c %s", self.name, cmd)
        out.command = self.encode(cmd)
        return out
    funcType = type(Docker.run)
    Docker.run = funcType(run_bash, Docker, testinfra.backend.docker.DockerBackend)
    return Docker
@pytest.fixture
 def Docker(request, args, image, cmd):
    ''' combine our fixtures into a docker run command and setup finalizer to cleanup '''
    assert 'docker' in check_output('id'), "Are you in the docker group?"
    docker_run = "docker run {} {} {}".format(args, image, cmd)
    docker_id = check_output(docker_run)
    def teardown():
        check_output("docker rm -f %s", docker_id)
    request.addfinalizer(teardown)
    docker_container = testinfra.get_backend("docker://" + docker_id)
    docker_container.id = docker_id
    return docker_container
@pytest.fixture
 def args(request):
    ''' -t became required when tput began being used '''
    return '-t -d'
@pytest.fixture(params=['debian', 'centos'])
 def tag(request):
    ''' consumed by image to make the test matrix '''
    return request.param
@pytest.fixture()
 def image(request, tag):
    ''' built by test_000_build_containers.py '''
    return 'pytest_pihole:{}'.format(tag)
@pytest.fixture()
 def cmd(request):
    ''' default to doing nothing by tailing null, but don't exit '''
    return 'tail -f /dev/null'
@@ -1,16 +0,0 @@
 FROM debian:jessie
 ENV GITDIR /etc/.pihole
 ENV SCRIPTDIR /opt/pihole
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
 RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 RUN true && \
    chmod +x $SCRIPTDIR/*
 ENV PH_TEST true
 #sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
@@ -1,18 +0,0 @@
 ''' This file starts with 000 to make it run first '''
 import pytest
 import testinfra
 run_local = testinfra.get_backend(
    "local://"
 ).get_module("Command").run
@pytest.mark.parametrize("image,tag", [
    ( 'test/debian.Dockerfile', 'pytest_pihole:debian' ),
    ( 'test/centos.Dockerfile', 'pytest_pihole:centos' ),
 ])
 def test_build_pihole_image(image, tag):
    build_cmd = run_local('docker build -f {} -t {} .'.format(image, tag))
    if build_cmd.rc != 0:
        print build_cmd.stdout
        print build_cmd.stderr
    assert build_cmd.rc == 0
@@ -1,325 +0,0 @@
 import pytest
 from textwrap import dedent
 SETUPVARS = {
    'PIHOLE_INTERFACE' : 'eth99',
    'IPV4_ADDRESS' : '1.1.1.1',
    'IPV6_ADDRESS' : 'FE80::240:D0FF:FE48:4672',
    'PIHOLE_DNS_1' : '4.2.2.1',
    'PIHOLE_DNS_2' : '4.2.2.2'
 }
 def test_setupVars_are_sourced_to_global_scope(Pihole):
    ''' currently update_dialogs sources setupVars with a dot,
    then various other functions use the variables.
    This confirms the sourced variables are in scope between functions '''
    setup_var_file = 'cat <<EOF> /etc/pihole/setupVars.conf\n'
    for k,v in SETUPVARS.iteritems():
        setup_var_file += "{}={}\n".format(k, v)
    setup_var_file += "EOF\n"
    Pihole.run(setup_var_file)
    script = dedent('''\
    set -e
    printSetupVars() {
        # Currently debug test function only
        echo "Outputting sourced variables"
        echo "PIHOLE_INTERFACE=${PIHOLE_INTERFACE}"
        echo "IPV4_ADDRESS=${IPV4_ADDRESS}"
        echo "IPV6_ADDRESS=${IPV6_ADDRESS}"
        echo "PIHOLE_DNS_1=${PIHOLE_DNS_1}"
        echo "PIHOLE_DNS_2=${PIHOLE_DNS_2}"
    }
    update_dialogs() {
        . /etc/pihole/setupVars.conf
    }
    update_dialogs
    printSetupVars
    ''')
    output = run_script(Pihole, script).stdout
    for k,v in SETUPVARS.iteritems():
        assert "{}={}".format(k, v) in output
 def test_setupVars_saved_to_file(Pihole):
    ''' confirm saved settings are written to a file for future updates to re-use '''
    set_setup_vars = '\n'  # dedent works better with this and padding matching script below
    for k,v in SETUPVARS.iteritems():
        set_setup_vars += "    {}={}\n".format(k, v)
    Pihole.run(set_setup_vars).stdout
    script = dedent('''\
    set -e
    echo start
    TERM=xterm
    source /opt/pihole/basic-install.sh
    {}
    finalExports
    cat /etc/pihole/setupVars.conf
    '''.format(set_setup_vars))
    output = run_script(Pihole, script).stdout
    for k,v in SETUPVARS.iteritems():
        assert "{}={}".format(k, v) in output
 def test_configureFirewall_firewalld_running_no_errors(Pihole):
    ''' confirms firewalld rules are applied when firewallD is running '''
    # firewallD returns 'running' as status
    mock_command('firewall-cmd', {'*':('running', 0)}, Pihole)
    # Whiptail dialog returns Ok for user prompt
    mock_command('whiptail', {'*':('', 0)}, Pihole)
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'Configuring FirewallD for httpd and dnsmasq.'
    assert expected_stdout in configureFirewall.stdout
    firewall_calls = Pihole.run('cat /var/log/firewall-cmd').stdout
    assert 'firewall-cmd --state' in firewall_calls
    assert 'firewall-cmd --permanent --add-port=80/tcp --add-port=53/tcp --add-port=53/udp' in firewall_calls
    assert 'firewall-cmd --reload' in firewall_calls
 def test_configureFirewall_firewalld_disabled_no_errors(Pihole):
    ''' confirms firewalld rules are not applied when firewallD is not running '''
    # firewallD returns non-running status
    mock_command('firewall-cmd', {'*':('not running', '1')}, Pihole)
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'No active firewall detected.. skipping firewall configuration.'
    assert expected_stdout in configureFirewall.stdout
 def test_configureFirewall_firewalld_enabled_declined_no_errors(Pihole):
    ''' confirms firewalld rules are not applied when firewallD is running, user declines ruleset '''
    # firewallD returns running status
    mock_command('firewall-cmd', {'*':('running', 0)}, Pihole)
    # Whiptail dialog returns Cancel for user prompt
    mock_command('whiptail', {'*':('', 1)}, Pihole)
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'Not installing firewall rulesets.'
    assert expected_stdout in configureFirewall.stdout
 def test_configureFirewall_no_firewall(Pihole):
    ''' confirms firewall skipped no daemon is running '''
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'No active firewall detected'
    assert expected_stdout in configureFirewall.stdout
 def test_configureFirewall_IPTables_enabled_declined_no_errors(Pihole):
    ''' confirms IPTables rules are not applied when IPTables is running, user declines ruleset '''
    # iptables command exists
    mock_command('iptables', {'*':('', '0')}, Pihole)
    # modinfo returns always true (ip_tables module check)
    mock_command('modinfo', {'*':('', '0')}, Pihole)
    # Whiptail dialog returns Cancel for user prompt
    mock_command('whiptail', {'*':('', '1')}, Pihole)
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'Not installing firewall rulesets.'
    assert expected_stdout in configureFirewall.stdout
 def test_configureFirewall_IPTables_enabled_rules_exist_no_errors(Pihole):
    ''' confirms IPTables rules are not applied when IPTables is running and rules exist '''
    # iptables command exists and returns 0 on calls (should return 0 on iptables -C)
    mock_command('iptables', {'-S':('-P INPUT DENY', '0')}, Pihole)
    # modinfo returns always true (ip_tables module check)
    mock_command('modinfo', {'*':('', '0')}, Pihole)
    # Whiptail dialog returns Cancel for user prompt
    mock_command('whiptail', {'*':('', '0')}, Pihole)
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'Installing new IPTables firewall rulesets'
    assert expected_stdout in configureFirewall.stdout
    firewall_calls = Pihole.run('cat /var/log/iptables').stdout
    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT' not in firewall_calls
    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT' not in firewall_calls
    assert 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT' not in firewall_calls
 def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
    ''' confirms IPTables rules are applied when IPTables is running and rules do not exist '''
    # iptables command and returns 0 on calls (should return 1 on iptables -C)
    mock_command('iptables', {'-S':('-P INPUT DENY', '0'), '-C':('', 1), '-I':('', 0)}, Pihole)
    # modinfo returns always true (ip_tables module check)
    mock_command('modinfo', {'*':('', '0')}, Pihole)
    # Whiptail dialog returns Cancel for user prompt
    mock_command('whiptail', {'*':('', '0')}, Pihole)
    configureFirewall = Pihole.run('''
    source /opt/pihole/basic-install.sh
    configureFirewall
    ''')
    expected_stdout = 'Installing new IPTables firewall rulesets'
    assert expected_stdout in configureFirewall.stdout
    firewall_calls = Pihole.run('cat /var/log/iptables').stdout
    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT' in firewall_calls
    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT' in firewall_calls
    assert 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT' in firewall_calls
 def test_installPiholeWeb_fresh_install_no_errors(Pihole):
    ''' confirms all web page assets from Core repo are installed on a fresh build '''
    installWeb = Pihole.run('''
    source /opt/pihole/basic-install.sh
    installPiholeWeb
    ''')
    assert 'Installing pihole custom index page...' in installWeb.stdout
    assert 'No default index.lighttpd.html file found... not backing up' in installWeb.stdout
    web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
    assert 'index.php' in web_directory
    assert 'index.js' in web_directory
    assert 'blockingpage.css' in web_directory
 def test_installPiholeWeb_empty_directory_no_errors(Pihole):
    ''' confirms all web page assets from Core repo are installed in an emtpy directory '''
    installWeb = Pihole.run('''
    source /opt/pihole/basic-install.sh
    mkdir -p /var/www/html/pihole
    installPiholeWeb
    ''')
    assert 'Installing pihole custom index page...' in installWeb.stdout
    assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
    assert 'index.php missing, replacing...' in installWeb.stdout
    assert 'index.js missing, replacing...' in installWeb.stdout
    assert 'blockingpage.css missing, replacing...' in installWeb.stdout
    web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
    assert 'index.php' in web_directory
    assert 'index.js' in web_directory
    assert 'blockingpage.css' in web_directory
 def test_installPiholeWeb_index_php_no_errors(Pihole):
    ''' confirms all web page assets from Core repo are installed when necessary '''
    installWeb = Pihole.run('''
    source /opt/pihole/basic-install.sh
    mkdir -p /var/www/html/pihole
    touch /var/www/html/pihole/index.php
    installPiholeWeb
    ''')
    assert 'Installing pihole custom index page...' in installWeb.stdout
    assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
    assert 'Existing index.php detected, not overwriting' in installWeb.stdout
    assert 'index.js missing, replacing...' in installWeb.stdout
    assert 'blockingpage.css missing, replacing...' in installWeb.stdout
    web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
    assert 'index.php' in web_directory
    assert 'index.js' in web_directory
    assert 'blockingpage.css' in web_directory
 def test_installPiholeWeb_index_js_no_errors(Pihole):
    ''' confirms all web page assets from Core repo are installed when necessary '''
    installWeb = Pihole.run('''
    source /opt/pihole/basic-install.sh
    mkdir -p /var/www/html/pihole
    touch /var/www/html/pihole/index.js
    installPiholeWeb
    ''')
    assert 'Installing pihole custom index page...' in installWeb.stdout
    assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
    assert 'index.php missing, replacing...' in installWeb.stdout
    assert 'Existing index.js detected, not overwriting' in installWeb.stdout
    assert 'blockingpage.css missing, replacing...' in installWeb.stdout
    web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
    assert 'index.php' in web_directory
    assert 'index.js' in web_directory
    assert 'blockingpage.css' in web_directory
 def test_installPiholeWeb_blockingpage_css_no_errors(Pihole):
    ''' confirms all web page assets from Core repo are installed when necessary '''
    installWeb = Pihole.run('''
    source /opt/pihole/basic-install.sh
    mkdir -p /var/www/html/pihole
    touch /var/www/html/pihole/blockingpage.css
    installPiholeWeb
    ''')
    assert 'Installing pihole custom index page...' in installWeb.stdout
    assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
    assert 'index.php missing, replacing...' in installWeb.stdout
    assert 'index.js missing, replacing...' in installWeb.stdout
    assert 'Existing blockingpage.css detected, not overwriting' in installWeb.stdout
    web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
    assert 'index.php' in web_directory
    assert 'index.js' in web_directory
    assert 'blockingpage.css' in web_directory
 def test_installPiholeWeb_already_populated_no_errors(Pihole):
    ''' confirms all web page assets from Core repo are installed when necessary '''
    installWeb = Pihole.run('''
    source /opt/pihole/basic-install.sh
    mkdir -p /var/www/html/pihole
    touch /var/www/html/pihole/index.php
    touch /var/www/html/pihole/index.js
    touch /var/www/html/pihole/blockingpage.css
    installPiholeWeb
    ''')
    assert 'Installing pihole custom index page...' in installWeb.stdout
    assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
    assert 'Existing index.php detected, not overwriting' in installWeb.stdout
    assert 'index.php missing, replacing...' not in installWeb.stdout
    assert 'Existing index.js detected, not overwriting' in installWeb.stdout
    assert 'index.js missing, replacing...' not in installWeb.stdout
    assert 'Existing blockingpage.css detected, not overwriting' in installWeb.stdout
    assert 'blockingpage.css missing, replacing... ' not in installWeb.stdout
    web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
    assert 'index.php' in web_directory
    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
    distro_check
    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):
    ''' 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
 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 '''
    full_script_path = '/usr/local/bin/{}'.format(script)
    mock_script = dedent('''\
    #!/bin/bash -e
    echo "\$0 \$@" >> /var/log/{script}
    case "\$1" in'''.format(script=script))
    for k, v in args.iteritems():
        case = dedent('''
        {arg})
        echo {res}
        exit {retcode}
        ;;'''.format(arg=k, res=v[0], retcode=v[1]))
        mock_script += case
    mock_script += dedent('''
    esac''')
    container.run('''
    cat <<EOF> {script}\n{content}\nEOF
    chmod +x {script}
    rm -f /var/log/{scriptlog}'''.format(script=full_script_path, content=mock_script, scriptlog=script))
 def run_script(Pihole, script):
    result = Pihole.run(script)
    assert result.rc == 0
    return result
@@ -1,13 +0,0 @@
 import pytest
 import testinfra
 run_local = testinfra.get_backend(
    "local://"
 ).get_module("Command").run
 def test_scripts_pass_shellcheck():
    ''' Make sure shellcheck does not find anything wrong with our shell scripts '''
    shellcheck = "find . -type f \( -name 'update.sh' -o -name 'piholeDebug.sh' \) | while read file; do shellcheck \"$file\"; done;"
    results = run_local(shellcheck)
    print results.stdout
    assert '' == results.stdout
Author	SHA1	Message	Date
Promofaux	84b54065ff	rebase on development branch	2016-05-13 11:13:47 +01:00
Promofaux	f8edc810ff	Copy some scripts from basic_install.sh. Add todo list comments.	2016-05-13 11:12:19 +01:00
Promofaux	c9b461a2f8	Flesh out updateDependencies. Add in root check.	2016-05-13 11:12:19 +01:00
Promofaux	e60490b4ed	ground work on secondary update script	2016-05-13 11:12:19 +01:00
Promofaux	0ba6e59888	Call secondary update script after pull	2016-05-13 11:12:19 +01:00
Promofaux	0dd5970f49	Fix typo. Add secondary update script	2016-05-13 11:12:19 +01:00
Promofaux	f73360e791	add secondary update script. This is where the files will be distributed from once repo is up to date	2016-05-13 11:12:19 +01:00
Promofaux	0d5600c21d	disable cron job (for now) to stop auto updates	2016-05-13 11:12:19 +01:00
Promofaux	c78c619cfb	remove `updatepihole`	2016-05-13 11:12:19 +01:00
Promofaux	6469586a67	add updatePihole.sh to install script	2016-05-13 11:12:19 +01:00
Promofaux	42614f6a7a	add pihole update script to 'pihole' command	2016-05-13 11:12:19 +01:00
Promofaux	aac7fa9c14	rename to updatePihole.sh	2016-05-13 11:10:04 +01:00
jacobsalmela	4b1633eac4	run at a different time than gravity update	2016-05-13 11:10:04 +01:00
jacobsalmela	86d7eada79	cron to update pi-hole This checks once a week if core Pi-hole needs updating.	2016-05-13 11:10:04 +01:00
jacobsalmela	a70c3bac61	add update mechanism This is some nice code found on stack overflow that I have been using for a while that seems very reliable. I just commented out a few things since we really only want to check if it needs an update or if it is already up to date.	2016-05-13 11:10:04 +01:00
Promofaux	67834062bc	Copy some scripts from basic_install.sh. Add todo list comments.	2016-04-28 21:40:25 +01:00
Promofaux	5b0e73c9f3	Flesh out updateDependencies. Add in root check.	2016-04-28 21:32:24 +01:00
Promofaux	f671eef3f0	ground work on secondary update script	2016-04-08 23:43:31 +01:00
Promofaux	5ab54012d5	Call secondary update script after pull	2016-04-08 23:43:22 +01:00
Promofaux	a04b7c4e99	Fix typo. Add secondary update script	2016-04-08 23:42:34 +01:00
Promofaux	e4ce5e3601	add secondary update script. This is where the files will be distributed from once repo is up to date	2016-04-08 23:31:15 +01:00
Promofaux	06f1aea319	disable cron job (for now) to stop auto updates	2016-04-08 23:17:37 +01:00
Promofaux	2ab6746d53	remove `updatepihole`	2016-04-08 23:16:38 +01:00
Promofaux	253dfdf084	add updatePihole.sh to install script	2016-04-08 23:15:18 +01:00
Promofaux	cec727be9d	add pihole update script to 'pihole' command	2016-04-08 23:13:13 +01:00
Promofaux	1d9531ef70	Merge branch 'development' into update-mechanism	2016-04-08 23:10:21 +01:00
Promofaux	fbc400c67e	rename to updatePihole.sh	2016-04-08 23:09:12 +01:00
jacobsalmela	0e59cf0fd1	run at a different time than gravity update	2016-03-18 20:11:34 -05:00
jacobsalmela	96bacc372a	cron to update pi-hole This checks once a week if core Pi-hole needs updating.	2016-03-18 18:02:17 -05:00
jacobsalmela	6daf80ef56	add update mechanism This is some nice code found on stack overflow that I have been using for a while that seems very reliable. I just commented out a few things since we really only want to check if it needs an update or if it is already up to date.	2016-03-18 18:01:51 -05:00