diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 3a8fdd3..07dc3c6 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.4.1 + uses: softprops/action-gh-release@v2.4.2 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} diff --git a/README.md b/README.md index 48254d3..2003234 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # uiDivStats - WebUI for Diversion statistics -## v4.0.12 -### Updated on 2025-Nov-07 +## v4.0.13 +### Updated on 2025-Nov-20 ## About A graphical representation of domain blocking performed by Diversion. diff --git a/uiDivStats.sh b/uiDivStats.sh index 4293095..efcfa7b 100644 --- a/uiDivStats.sh +++ b/uiDivStats.sh @@ -13,7 +13,7 @@ ## Forked from https://github.com/jackyaz/uiDivStats ## ## ## ################################################################### -# Last Modified: 2025-Nov-04 +# Last Modified: 2025-Nov-16 #------------------------------------------------------------------ ################# Shellcheck directives ############### @@ -35,9 +35,9 @@ ### Start of script variables ### readonly SCRIPT_NAME="uiDivStats" -readonly SCRIPT_VERSION="v4.0.12" -readonly SCRIPT_VERSTAG="25110422" -SCRIPT_BRANCH="master" +readonly SCRIPT_VERSION="v4.0.13" +readonly SCRIPT_VERSTAG="25111620" +SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME.d" readonly SCRIPT_CONF="$SCRIPT_DIR/config" @@ -443,7 +443,7 @@ Update_File() } ##----------------------------------------## -## Modified by Martinski W. [2025-Jan-18] ## +## Modified by Martinski W. [2025-Nov-15] ## ##----------------------------------------## Conf_FromSettings() { @@ -479,10 +479,10 @@ Conf_FromSettings() rm -f "$TMPFILE" rm -f "${SETTINGSFILE}.bak" - if diff "$SCRIPT_CONF" "${SCRIPT_CONF}.bak" | grep -q "QUERYMODE=" + if diff -U0 "$SCRIPT_CONF" "${SCRIPT_CONF}.bak" | grep -q "QUERYMODE=" then QueryMode "$(QueryMode check)" fi - if diff "$SCRIPT_CONF" "${SCRIPT_CONF}.bak" | grep -q "CACHEMODE=" + if diff -U0 "$SCRIPT_CONF" "${SCRIPT_CONF}.bak" | grep -q "CACHEMODE=" then CacheMode "$(CacheMode check)" fi Print_Output true "Merge of updated settings from WebUI completed successfully" "$PASS"