Skip to content

Commit e49ae4a

Browse files
Code Cleanup & Improvements.
1 parent 5fa5433 commit e49ae4a

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

MerlinAU.sh

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
66
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
7-
# Last Modified: 2024-May-31
7+
# Last Modified: 2024-Jun-01
88
###################################################################
99
set -u
1010

@@ -236,7 +236,7 @@ _DoExit_()
236236
## Modified by Martinski W. [2024-May-31] ##
237237
##----------------------------------------##
238238
## To support new "3006" F/W Basecode ##
239-
if [ "$fwInstalledBaseVers" -eq 3006 ]
239+
if [ "$fwInstalledBaseVers" -ge 3006 ]
240240
then readonly nvramLEDsVar=AllLED
241241
else readonly nvramLEDsVar=led_disable
242242
fi
@@ -1718,26 +1718,6 @@ if false ; then echo "3004.388.6.2" ; return 0 ; fi
17181718
echo "$theVersionStr"
17191719
}
17201720

1721-
##----------------------------------------##
1722-
## Modified by Martinski W. [2024-May-31] ##
1723-
##----------------------------------------##
1724-
_GetCurrentFWInstalledShortVersion_()
1725-
{
1726-
1727-
##FOR TESTING/DEBUG ONLY##
1728-
if false ; then echo "388.6.2" ; return 0 ; fi
1729-
##FOR TESTING/DEBUG ONLY##
1730-
1731-
local theVersionStr extVersNum
1732-
1733-
extVersNum="$(echo "$fwInstalledExtendNum" | awk -F '-' '{print $1}')"
1734-
echo "$extVersNum" | grep -qiE "^(alpha|beta)" && extVersNum="0_$extVersNum"
1735-
[ -z "$extVersNum" ] && extVersNum=0
1736-
1737-
theVersionStr="${fwInstalledBuildVers}.$extVersNum"
1738-
echo "$theVersionStr"
1739-
}
1740-
17411721
##----------------------------------------##
17421722
## Modified by Martinski W. [2024-Mar-31] ##
17431723
##----------------------------------------##

0 commit comments

Comments
 (0)