Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.6.4 #67

Merged
merged 11 commits into from
May 1, 2023
30 changes: 30 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
## Thank you for your contribution

Please read the comments below to help me consider your Pull Request.

**Please make sure you base your code and PRs against the repositories `development` branch.**

---

**What does this PR aim to accomplish?:**

<!--- Replace this with detailed description, screenshots (if necessary), as well as links to any relevant GitHub issues -->

**How does this PR accomplish the above?:**

<!--- Replace this with a detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix -->

---
**By submitting this pull request, I confirm the following:**

1. I have commented my proposed changes within the code and I have tested my changes.
2. I am willing to help maintain this change if there are issues with it later.
3. I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
4. I have checked that another pull request for this purpose does not exist.
5. I have considered, and confirmed that this submission will be valuable to others.
6. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
7. I give this submission freely, and claim no ownership to its content.

---

- [ ] I have read the above and my PR is ready for review. *Check this box to confirm*
2 changes: 1 addition & 1 deletion .github/workflows/editorconfig-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
build:
name: editorconfig-checker
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: editorconfig-checker/action-editorconfig-checker@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
# Required to access files of this repository
- uses: actions/checkout@v2
- uses: actions/checkout@v3

# Download Shellcheck and add it to the workflow path
- name: Download Shellcheck
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ On my [NanoPi NeoPlus2](http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Pl

---

## Usage
## Installation

Download the tool, either via `git clone` or [link](https://raw.githubusercontent.com/yubiuser/pihole_adlist_tool/master/pihole_adlist_tool).
Make the script executable with `chmod +x ./pihole_adlist_tool` and run it with `./pihole_adlist_tool`

## Options

```bash
pihole_adlist_tool [options]
Expand Down
2 changes: 1 addition & 1 deletion pihole_adlist_tool
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ if [ "$ENABLE_ALL_ADLISTS_FOR_ANALYSIS" -eq 1 ]; then

echo
echo " [i] There is a mismatch between your enabled adlists and the data found in the gravity database."
echo " You have ${bold}${#adlist_conf_old_enabled[@]}${normal} adlists enabled, but data from ${bold}${#adlist_enabled_in_gravity[@]}${normal} (patially different) adlists in your gravity database."
echo " You have ${bold}${#adlist_conf_old_enabled[@]}${normal} adlists enabled, but data from ${bold}${#adlist_enabled_in_gravity[@]}${normal} (partially different) adlists in your gravity database."
echo " You're likely disabled/enabled adlist without running gravity afterwards."
echo " It's highly recommended to run gravity now to solve the differences, otherwise this tool will analyze the available data."
echo
Expand Down