Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.4.1 #22

Merged
merged 38 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
43698f0
Replace tab with space
jackyaz Aug 28, 2021
d29f0a6
Merge branch 'master' into develop
jackyaz Dec 17, 2021
23d0466
Merge branch 'master' into develop
jackyaz Dec 17, 2021
11dc5c3
Version bump
jackyaz Jan 2, 2022
e221ca2
Use visibility in CSS for dropdowns instead of display
jackyaz Jan 2, 2022
59dd50c
Make a change to ASP to trigger WebUI re-mount in update for new CSS
jackyaz Jan 2, 2022
09c369b
Make sure we delete old dropdown-content CSS
jackyaz Jan 2, 2022
02f59db
Use Process_Upgrade to mnake sure CSS updates at CLI update
jackyaz Jan 2, 2022
1b4d626
Merge branch 'master' into develop
jackyaz Jan 3, 2022
70c0d55
Shellcheck ignores
jackyaz Jan 4, 2022
acbf8b7
Remove unused fields in Sitemap
jackyaz Jan 5, 2022
033e65d
Update README
jackyaz Jan 5, 2022
e9fecf3
Add files for tailtaintdns
jackyaz Jan 5, 2022
e637534
Update URLs for Scarf
jackyaz Jan 5, 2022
a381197
Option to enable wtachdog for dnsmasq tainted
jackyaz Jan 5, 2022
49968d8
Menu line spacing
jackyaz Jan 5, 2022
627fdde
Need sub files on upgrade
jackyaz Jan 5, 2022
601f659
Add full comment in services-start
jackyaz Jan 5, 2022
1b98ca3
Tighten up grep matching
jackyaz Jan 5, 2022
fa09bf6
Start S95tailtaintdns when enabling it
jackyaz Jan 5, 2022
76c1eb4
Test if we should restart tailing at any point, e.g. reboot
jackyaz Jan 14, 2022
a7803d9
Line breaks
jackyaz Jan 14, 2022
5603177
Always tail /tmp/syslog
jackyaz Jan 16, 2022
60cc205
Fix addons icon
Tianyou-Song Apr 13, 2023
779e43f
Update scmerlin_www.asp
Martinski4GitHub Jun 5, 2023
f7dcba0
Update scmerlin.sh
Martinski4GitHub Jun 5, 2023
28d31ee
Merge pull request #23 from Tianyou-Song/patch-1
jackyaz Jun 5, 2023
dbca089
Update scmerlin_www.asp
Martinski4GitHub Jun 5, 2023
d7aeda7
Merge branch 'jackyaz:develop' into develop
Martinski4GitHub Jun 6, 2023
29fa3f3
Add check for existing users to ensure background-size is added
jackyaz Jun 6, 2023
45c2ac2
Merge branch 'jackyaz:develop' into develop
Martinski4GitHub Jun 10, 2023
92ce70c
Update scmerlin.sh
Martinski4GitHub Jun 10, 2023
09dee12
Merge pull request #24 from Martinski4GitHub/develop
jackyaz Jul 2, 2023
d76fbb0
Improved code to get temperatures from a 3rd set of vars.
Martinski4GitHub Jul 6, 2023
8410589
Merge pull request #25 from Martinski4GitHub/develop
jackyaz Jul 7, 2023
06a1225
Bug fix when adding "startup" call to "services-start" script.
Martinski4GitHub Mar 12, 2024
102a3f2
Merge pull request #26 from Martinski4GitHub/develop
jackyaz Mar 12, 2024
40cc81c
Update scmerlin.sh
jackyaz Mar 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 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)
![Shellcheck](https://github.com/jackyaz/scMerlin/actions/workflows/shellcheck.yml/badge.svg)

## v2.4.0
### Updated on 2021-08-08
## v2.4.1
### Updated on 2022-01-05
## About
scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin.

Expand All @@ -19,7 +19,7 @@ Love the script and want to support future development? Any and all donations gr
Using your preferred SSH client/terminal, copy and paste the following command, then press Enter:

```sh
/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
/usr/sbin/curl -fsL --retry 3 "https://jackyaz.io/scmerlin/master/install/scmerlin.sh" -o "/jffs/scripts/scmerlin" && chmod 0755 /jffs/scripts/scmerlin && /jffs/scripts/scmerlin install
```

## Supported firmware versions
Expand Down Expand Up @@ -48,3 +48,8 @@ If this does not work, you will need to use the full path:

## Help
Please post about any issues and problems here: [Asuswrt-Merlin AddOns on SNBForums](https://www.snbforums.com/forums/asuswrt-merlin-addons.60/?prefix_id=23)

### Scarf Gateway
Installs and updates for this addon are redirected via the [Scarf Gateway](https://about.scarf.sh/scarf-gateway) by [Scarf](https://about.scarf.sh/about). This allows me to gather data on the number of new installations of my addons, how often users check for updates and more. This is purely for my use to actually see some usage data from my addons so that I can see the value provided by my continued work. It does not mean I am going to start charging to use my addons. My addons have been, are, and will always be completely free to use.

Please refer to Scarf's [Privacy Policy](https://about.scarf.sh/privacy) for more information about the data that is collected and how it is processed.
19 changes: 19 additions & 0 deletions S95tailtaintdns
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh
# shellcheck disable=SC1091
# shellcheck disable=SC2034

if [ "$1" = "restart" ] || [ "$1" = "stop" ] || [ "$1" = "kill" ]; then
killall -q tailtaintdnsd
killall -q tailtaintdns
fi

ENABLED=yes
PROCS=/jffs/addons/scmerlin.d/tailtaintdnsd
ARGS=""
PREARGS=""
PRECMD=""
POSTCMD=""
DESC=$PROCS
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

. /jffs/addons/scmerlin.d/sc.func
1 change: 1 addition & 0 deletions S99tailtop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
# shellcheck disable=SC1091
# shellcheck disable=SC2034

if [ "$1" = "restart" ] || [ "$1" = "stop" ] || [ "$1" = "kill" ]; then
Expand Down
Loading
Loading