Release 5.18.2 (#5629)

pi-hole · Mar 31, 2024 · 5490a6e · 5490a6e
2 parents 74a44ca + 8cfccf9
commit 5490a6e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.1.2
     # Initializes the CodeQL tools for scanning.
     -
       name: Initialize CodeQL

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
       - name: Remove 'stale' label
         run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
         env:

diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
@@ -33,7 +33,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
       - name: Opening pull request
         run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
 
       - name: Check scripts in repository are executable
         run: |
@@ -64,7 +64,7 @@ jobs:
       DISTRO: ${{matrix.distro}}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v5.0.0

diff --git a/gravity.sh b/gravity.sh
@@ -567,14 +567,14 @@ gravity_DownloadBlocklistFromUrl() {
   if [[ $url == "file://"* ]]; then
     # Get the file path
     file_path=$(echo "$url" | cut -d'/' -f3-)
-    # Check if the file exists
-    if [[ ! -e $file_path ]]; then
+    # Check if the file exists and is a regular file (i.e. not a socket, fifo, tty, block). Might still be a symlink.
+    if [[ ! -f $file_path ]]; then
       # Output that the file does not exist
       echo -e "${OVER}  ${CROSS} ${file_path} does not exist"
       download=false
     else
-      # Check if the file has a+r permissions
-      permissions=$(stat -c "%a" "$file_path")
+      # Check if the file or a file referenced by the symlink has a+r permissions
+      permissions=$(stat -L -c "%a" "$file_path")
       if [[ $permissions == *4 || $permissions == *5 || $permissions == *6 || $permissions == *7 ]]; then
         # Output that we are using the local file
         echo -e "${OVER}  ${INFO} Using local file ${file_path}"