Skip to content

Commit 1432058

Browse files
Merge branch 'dev' into WebFun
2 parents 7f4fef2 + ba7a51c commit 1432058

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

MerlinAU.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ routerModelCheckFailed=false
6161
offlineUpdateTrigger=false
6262

6363
##----------------------------------------##
64-
## Modified by Martinski W. [2025-Jan-05] ##
64+
## Modified by Martinski W. [2025-Feb-15] ##
6565
##----------------------------------------##
6666
readonly NOct="\e[0m"
6767
readonly BOLDct="\e[1m"
@@ -2348,7 +2348,7 @@ _CheckForNewGUIVersionUpdate_()
23482348
}
23492349

23502350
##----------------------------------------##
2351-
## Modified by Martinski W. [2025-Jan-11] ##
2351+
## Modified by Martinski W. [2025-Feb-15] ##
23522352
##----------------------------------------##
23532353
_CurlFileDownload_()
23542354
{
@@ -2380,7 +2380,7 @@ _CurlFileDownload_()
23802380
}
23812381

23822382
##----------------------------------------##
2383-
## Modified by Martinski W. [2025-Jan-20] ##
2383+
## Modified by Martinski W. [2025-Feb-15] ##
23842384
##----------------------------------------##
23852385
_DownloadScriptFiles_()
23862386
{
@@ -2508,6 +2508,7 @@ _SCRIPT_UPDATE_()
25082508

25092509
if _DownloadScriptFiles_ update
25102510
then
2511+
25112512
if "$inRouterSWmode"
25122513
then _SetVersionSharedSettings_ local "$DLRepoVersion" ; fi
25132514
printf "\n$(date) - Successfully downloaded $SCRIPT_NAME v${DLRepoVersion}\n"

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
## v1.4.0
33
## 2025-Feb-??
44

5-
![image](https://github.com/user-attachments/assets/185f9fe4-acdb-419a-8154-ab6fa6e0fd46)
6-
![image](https://github.com/user-attachments/assets/8f22818d-2118-4c47-a54a-e54fb147fd6b)
7-
![image](https://github.com/user-attachments/assets/bd2f41b6-230d-4ef8-ad41-e7a2d8a77746)
8-
![image](https://github.com/user-attachments/assets/a064e3d1-e615-4021-a5de-127cdb6cb8e4)
5+
![image](https://github.com/user-attachments/assets/2eebe686-364a-4fb1-9493-e6b91c23b9fd)
6+
![image](https://github.com/user-attachments/assets/5ca4587f-5b6e-45a6-9c2d-a889b91f8368)
7+
![image](https://github.com/user-attachments/assets/959d7bb6-20b4-4e97-ab3e-b7b90cc08744)
8+
![image](https://github.com/user-attachments/assets/2e92af06-a6b1-4573-9a89-6986e739b514)
99

1010
## SUPPORTED MERLIN MODELS (Multi-image models) - i.e. Any model that uses a .w or a .pkgtb file
1111

@@ -119,8 +119,13 @@ To install MerlinAutoUpdate, follow these steps:
119119
Enable SSH on your router if not already enabled.
120120
Use your preferred SSH client to connect to the router.
121121

122-
Download the script to your router:
123-
Copy and paste:
122+
*MerlinAU is now available through AMTM!*
123+
1. Simply connect to the router via SSH and type: "amtm" to load AMTM
124+
2. Select option (i) to view the list of available applications.
125+
3. MerlinAU is option (8) from AMTM.
126+
127+
*Manual Installation*
128+
1. To Download the script to your router, Copy and paste:
124129
```bash
125130
curl --retry 3 "https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router/master/MerlinAU.sh" -o "/jffs/scripts/MerlinAU.sh" && chmod +x "/jffs/scripts/MerlinAU.sh"
126131
```

0 commit comments

Comments
 (0)