From 61feaabbf886f66c8c8d08791fbdf4f3128aaedc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jun 2025 13:00:10 +0000 Subject: [PATCH 1/3] Bump softprops/action-gh-release in the all-actions group Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.2.2 to 2.3.2 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.2.2...v2.3.2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.3.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index e841c2e..ef961c3 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.2.2 + uses: softprops/action-gh-release@v2.3.2 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} From 7bfdad53dd7cdf02318f2fca216b9390eae95f05 Mon Sep 17 00:00:00 2001 From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com> Date: Wed, 16 Jul 2025 00:15:09 -0700 Subject: [PATCH 2/3] Improvements in messaging Improved messaging to show uninstallation command when YazFi is not supported on the current F/W. --- README.md | 4 ++-- YazFi.sh | 38 +++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 069ef96..3cd878f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # YazFi - enhanced AsusWRT-Merlin Guest WiFi Networks -## v4.4.7 -### Updated on 2025-Jun-18 +## v4.4.8 +### Updated on 2025-Jul-15 ## About Feature expansion of guest WiFi networks on AsusWRT-Merlin, including, but not limited to: diff --git a/YazFi.sh b/YazFi.sh index ff4608a..3935c13 100644 --- a/YazFi.sh +++ b/YazFi.sh @@ -17,7 +17,7 @@ ## Guest Network DHCP script and for ## ## AsusWRT-Merlin firmware ## ################################################### -# Last Modified: 2025-Jun-18 +# Last Modified: 2025-Jul-15 #-------------------------------------------------- ###### Shellcheck directives ###### @@ -41,10 +41,10 @@ ### Start of script variables ### readonly SCRIPT_NAME="YazFi" readonly SCRIPT_CONF="/jffs/addons/$SCRIPT_NAME.d/config" -readonly YAZFI_VERSION="v4.4.7" -readonly SCRIPT_VERSION="v4.4.7" -readonly SCRIPT_VERSTAG="25061807" -SCRIPT_BRANCH="master" +readonly YAZFI_VERSION="v4.4.8" +readonly SCRIPT_VERSION="v4.4.8" +readonly SCRIPT_VERSTAG="25071523" +SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME.d" readonly USER_SCRIPT_DIR="$SCRIPT_DIR/userscripts.d" @@ -64,6 +64,8 @@ readonly PASS="\\e[32m" readonly BOLD="\\e[1m" readonly SETTING="${BOLD}\\e[36m" readonly CLEARFORMAT="\\e[0m" +readonly CLRct="\e[0m" +readonly MGNTct="\e[1;35m" ### End of output format variables ### ### Start of router environment variables ### @@ -3828,9 +3830,9 @@ Menu_Uninstall() flock -x "$FD" Get_WebUI_Page "$SCRIPT_DIR/YazFi_www.asp" if [ -n "$MyWebPage" ] && \ - [ "$MyWebPage" != "NONE" ] && \ - [ -f "$TEMP_MENU_TREE" ] - then + [ "$MyWebPage" != "NONE" ] && \ + [ -f "$TEMP_MENU_TREE" ] + then sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" rm -f "$SCRIPT_WEBPAGE_DIR/$MyWebPage" rm -f "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" @@ -3841,7 +3843,7 @@ Menu_Uninstall() rm -f "$SCRIPT_DIR/YazFi_www.asp" 2>/dev/null while true - do + do printf "\n${BOLD}Do you want to delete %s configuration file(s)? (y/n)${CLEARFORMAT} " "$SCRIPT_NAME" read -r confirm case "$confirm" in @@ -3870,8 +3872,8 @@ Menu_Uninstall() ##----------------------------------------## Show_About() { + printf "About ${MGNTct}${SCRIPT_VERS_INFO}${CLRct}\n" cat < VPN, separate subnets per guest network, pinhole access to LAN resources (e.g. DNS) and more! @@ -3895,8 +3897,8 @@ EOF ##----------------------------------------## Show_Help() { + printf "HELP ${MGNTct}${SCRIPT_VERS_INFO}${CLRct}\n" cat < Date: Mon, 21 Jul 2025 01:38:21 -0700 Subject: [PATCH 3/3] Improved Messaging Minor changes for improved messaging. --- README.md | 2 +- YazFi.sh | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3cd878f..23a2400 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # YazFi - enhanced AsusWRT-Merlin Guest WiFi Networks ## v4.4.8 -### Updated on 2025-Jul-15 +### Updated on 2025-Jul-20 ## About Feature expansion of guest WiFi networks on AsusWRT-Merlin, including, but not limited to: diff --git a/YazFi.sh b/YazFi.sh index 3935c13..cc49283 100644 --- a/YazFi.sh +++ b/YazFi.sh @@ -17,7 +17,7 @@ ## Guest Network DHCP script and for ## ## AsusWRT-Merlin firmware ## ################################################### -# Last Modified: 2025-Jul-15 +# Last Modified: 2025-Jul-18 #-------------------------------------------------- ###### Shellcheck directives ###### @@ -43,7 +43,7 @@ readonly SCRIPT_NAME="YazFi" readonly SCRIPT_CONF="/jffs/addons/$SCRIPT_NAME.d/config" readonly YAZFI_VERSION="v4.4.8" readonly SCRIPT_VERSION="v4.4.8" -readonly SCRIPT_VERSTAG="25071523" +readonly SCRIPT_VERSTAG="25071823" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME.d" @@ -77,7 +77,8 @@ readonly scriptVersRegExp="v[0-9]{1,2}([.][0-9]{1,2})([.][0-9]{1,2})" readonly webPageFileRegExp="user([1-9]|[1-2][0-9])[.]asp" readonly webPageLineTabExp="\{url: \"$webPageFileRegExp\", tabName: " readonly webPageLineRegExp="${webPageLineTabExp}\"$SCRIPT_NAME\"\}," -readonly scriptVERINFO="[${SCRIPT_VERSION}_${SCRIPT_VERSTAG}, Branch: $SCRIPT_BRANCH]" +readonly branchx_TAG="Branch: $SCRIPT_BRANCH" +readonly version_TAG="${SCRIPT_VERSION}_${SCRIPT_VERSTAG}" # Give higher priority to built-in binaries # export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$PATH" @@ -743,7 +744,7 @@ _Firmware_Support_Check_() Print_Output true "Please update to benefit from $SCRIPT_NAME detecting wireless restarts" "$WARN" elif [ "$fwInstalledBaseVers" -eq 3006 ] then - FW_NOT_Supported=true + FW_NOT_Supported=true ; echo Print_Output true "F/W ${fwInstalledBranchVer}.* version detected. YazFi is NOT supported on this firmware." "$ERR" fi @@ -3874,7 +3875,7 @@ Show_About() { printf "About ${MGNTct}${SCRIPT_VERS_INFO}${CLRct}\n" cat < VPN, separate subnets per guest network, pinhole access to LAN resources (e.g. DNS) and more! @@ -3925,9 +3926,9 @@ EOF # Make the one call needed to load module # modprobe xt_comment -if [ "$SCRIPT_BRANCH" != "develop" ] -then SCRIPT_VERS_INFO="" -else SCRIPT_VERS_INFO="$scriptVERINFO" +if [ "$SCRIPT_BRANCH" = "master" ] +then SCRIPT_VERS_INFO="[$branchx_TAG]" +else SCRIPT_VERS_INFO="[$version_TAG, $branchx_TAG]" fi ##----------------------------------------## @@ -3943,7 +3944,7 @@ then printf "${MGNTct}/jffs/scripts/$SCRIPT_NAME uninstall${CLRct}\n\n" fi PressEnter - printf "\n${ERR}Exiting...${CLRct}\n" + printf "\n${ERR}Exiting...${CLRct}\n\n" Clear_Lock exit 1 fi