Skip to content

Commit

Permalink
Ready to merge
Browse files Browse the repository at this point in the history
Update README
  • Loading branch information
jackyaz committed Jan 4, 2021
1 parent 4d601f0 commit d17a75c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/bfd397624cdf4803a465d4ae1530e7fe)](https://www.codacy.com/app/jackyaz/scMerlin?utm_source=github.com&utm_medium=referral&utm_content=jackyaz/scMerlin&utm_campaign=Badge_Grade)
[![Build Status](https://travis-ci.com/jackyaz/scMerlin.svg?branch=master)](https://travis-ci.com/jackyaz/scMerlin)

## v2.0.0
### Updated on 2020-11-06
## v2.1.0
### Updated on 2021-01-04
## About
scMerlin allows you to easily control the most common services/scripts on your router.

Expand All @@ -23,6 +23,9 @@ Using your preferred SSH client/terminal, copy and paste the following command,
/usr/sbin/curl --retry 3 "https://raw.githubusercontent.com/jackyaz/scmerlin/master/scmerlin.sh" -o "/jffs/scripts/scmerlin" && chmod 0755 /jffs/scripts/scmerlin && /jffs/scripts/scmerlin install
```

## Supported firmware versions
You must be running firmware Merlin 384.15/384.13_4 or Fork 43E5 (or later) [Asuswrt-Merlin](https://asuswrt.lostrealm.ca/)

## Usage
### WebUI
scMerlin can be used via the WebUI, in the Addons section.
Expand Down
2 changes: 1 addition & 1 deletion scmerlin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ readonly SCRIPT_NAME_LOWER=$(echo $SCRIPT_NAME | tr 'A-Z' 'a-z' | sed 's/d//')
#shellcheck disable=SC2034
readonly SCM_VERSION="v2.1.0"
readonly SCRIPT_VERSION="v2.1.0"
readonly SCRIPT_BRANCH="develop"
readonly SCRIPT_BRANCH="master"
readonly SCRIPT_REPO="https://raw.githubusercontent.com/jackyaz/$SCRIPT_NAME/$SCRIPT_BRANCH"
readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
readonly SCRIPT_WEBPAGE_DIR="$(readlink /www/user)"
Expand Down

0 comments on commit d17a75c

Please sign in to comment.