Skip to content

Code Improvement #78

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.

Sign up for GitHub

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

Merged
Martinski4GitHub merged 1 commit into from
Apr 16, 2026
Merged

Code Improvement #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v3.0.13
Updated on 2026-Apr-15
* IMPROVED: Modified code to ensure that the F/W built-in hook scripts used by the add-on have executable permissions.

## v3.0.12
Updated on 2026-Apr-11
* FIXED: Added "unset LD_LIBRARY_PATH" line as a workaround due to the latest Entware binaries using the RUNPATH embedded library search path mechanism instead of the previous RPATH method.
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# connmon

## v3.0.12
### Updated on 2026-Apr-11
## v3.0.13
### Updated on 2026-Apr-15

## About
connmon is an internet connection monitoring tool for AsusWRT Merlin with charts for daily, weekly and monthly summaries.
Expand Down
55 changes: 31 additions & 24 deletions connmon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
## Forked from https://github.com/jackyaz/connmon ##
## ##
##############################################################
# Last Modified: 2026-Apr-11
# Last Modified: 2026-Apr-15
#-------------------------------------------------------------

############## Shellcheck directives #############
Expand All @@ -36,8 +36,8 @@

### Start of script variables ###
readonly SCRIPT_NAME="connmon"
readonly SCRIPT_VERSION="v3.0.12"
readonly SCRIPT_VERSTAG="26041103"
readonly SCRIPT_VERSION="v3.0.13"
readonly SCRIPT_VERSTAG="26041500"
SCRIPT_BRANCH="develop"
SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH"
readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME.d"
Expand Down Expand Up @@ -706,7 +706,7 @@ Conf_Exists()
{
local PINGFREQUENCY AUTOMATEDopt delCRON=false sedNum portNum

if [ -f "$SCRIPT_CONF" ]
if [ -s "$SCRIPT_CONF" ]
then
dos2unix "$SCRIPT_CONF"
chmod 0644 "$SCRIPT_CONF"
Expand Down Expand Up @@ -1152,7 +1152,7 @@ Auto_ServiceEvent()
local theScriptFilePath="/jffs/scripts/$SCRIPT_NAME"
case $1 in
create)
if [ -f /jffs/scripts/service-event ]
if [ -s /jffs/scripts/service-event ]
then
STARTUPLINECOUNT="$(grep -c '# '"$SCRIPT_NAME" /jffs/scripts/service-event)"
STARTUPLINECOUNTEX="$(grep -cx 'if echo "$2" | /bin/grep -q "'"$SCRIPT_NAME"'"; then { '"$theScriptFilePath"' service_event "$@" & }; fi # '"$SCRIPT_NAME" /jffs/scripts/service-event)"
Expand All @@ -1161,7 +1161,6 @@ Auto_ServiceEvent()
then
sed -i -e '/# '"$SCRIPT_NAME"'/d' /jffs/scripts/service-event
fi

if [ "$STARTUPLINECOUNTEX" -eq 0 ]
then
{
Expand All @@ -1174,14 +1173,15 @@ Auto_ServiceEvent()
echo 'if echo "$2" | /bin/grep -q "'"$SCRIPT_NAME"'"; then { '"$theScriptFilePath"' service_event "$@" & }; fi # '"$SCRIPT_NAME"
echo
} > /jffs/scripts/service-event
chmod 0755 /jffs/scripts/service-event
fi
chmod 0755 /jffs/scripts/service-event
;;
delete)
if [ -f /jffs/scripts/service-event ]
if [ -s /jffs/scripts/service-event ]
then
STARTUPLINECOUNT="$(grep -c '# '"$SCRIPT_NAME" /jffs/scripts/service-event)"
if [ "$STARTUPLINECOUNT" -gt 0 ]; then
if [ "$STARTUPLINECOUNT" -gt 0 ]
then
sed -i -e '/# '"$SCRIPT_NAME"'/d' /jffs/scripts/service-event
fi
fi
Expand All @@ -1197,15 +1197,15 @@ Auto_Startup()
local theScriptFilePath="/jffs/scripts/$SCRIPT_NAME"
case $1 in
create)
if [ -f /jffs/scripts/services-start ]
if [ -s /jffs/scripts/services-start ]
then
STARTUPLINECOUNT="$(grep -c '# '"$SCRIPT_NAME" /jffs/scripts/services-start)"

if [ "$STARTUPLINECOUNT" -gt 0 ]; then
if [ "$STARTUPLINECOUNT" -gt 0 ]
then
sed -i -e '/# '"$SCRIPT_NAME"'/d' /jffs/scripts/services-start
fi
fi
if [ -f /jffs/scripts/post-mount ]
if [ -s /jffs/scripts/post-mount ]
then
STARTUPLINECOUNT="$(grep -c '# '"$SCRIPT_NAME" /jffs/scripts/post-mount)"
STARTUPLINECOUNTEX="$(grep -cx '\[ -x "${1}/entware/bin/opkg" \] && \[ -x '"$theScriptFilePath"' \] && '"$theScriptFilePath"' startup "$@" & # '"$SCRIPT_NAME" /jffs/scripts/post-mount)"
Expand All @@ -1215,7 +1215,6 @@ Auto_Startup()
sed -i -e '/# '"$SCRIPT_NAME"'/d' /jffs/scripts/post-mount
STARTUPLINECOUNT=0
fi

if [ "$STARTUPLINECOUNTEX" -eq 0 ]
then
{
Expand All @@ -1228,21 +1227,23 @@ Auto_Startup()
echo '[ -x "${1}/entware/bin/opkg" ] && [ -x '"$theScriptFilePath"' ] && '"$theScriptFilePath"' startup "$@" & # '"$SCRIPT_NAME"
echo
} > /jffs/scripts/post-mount
chmod 0755 /jffs/scripts/post-mount
fi
chmod 0755 /jffs/scripts/post-mount
;;
delete)
if [ -f /jffs/scripts/services-start ]
if [ -s /jffs/scripts/services-start ]
then
STARTUPLINECOUNT="$(grep -c '# '"$SCRIPT_NAME" /jffs/scripts/services-start)"
if [ "$STARTUPLINECOUNT" -gt 0 ]; then
if [ "$STARTUPLINECOUNT" -gt 0 ]
then
sed -i -e '/# '"$SCRIPT_NAME"'/d' /jffs/scripts/services-start
fi
fi
if [ -f /jffs/scripts/post-mount ]
if [ -s /jffs/scripts/post-mount ]
then
STARTUPLINECOUNT="$(grep -c '# '"$SCRIPT_NAME" /jffs/scripts/post-mount)"
if [ "$STARTUPLINECOUNT" -gt 0 ]; then
if [ "$STARTUPLINECOUNT" -gt 0 ]
then
sed -i -e '/# '"$SCRIPT_NAME"'/d' /jffs/scripts/post-mount
fi
fi
Expand All @@ -1259,9 +1260,11 @@ Auto_Cron()
case $1 in
create)
STARTUPLINECOUNT="$(cru l | grep -c "#${SCRIPT_NAME}#")"
if [ "$STARTUPLINECOUNT" -gt 0 ]; then
if [ "$STARTUPLINECOUNT" -gt 0 ]
then
cru d "${SCRIPT_NAME}"
fi

STARTUPLINECOUNTGEN="$(cru l | grep -c "${SCRIPT_NAME}_generate")"
CRU_SCHHOUR="$(_GetConfigParam_ SCHHOURS '*')"
CRU_SCHMINS="$(_GetConfigParam_ SCHMINS '*/5')"
Expand All @@ -1285,21 +1288,25 @@ Auto_Cron()
cru d "${SCRIPT_NAME}_trimDB"
STARTUPLINECOUNTTRIM="$(cru l | grep -c "${SCRIPT_NAME}_trimDB")"
fi
if [ "$STARTUPLINECOUNTTRIM" -eq 0 ]; then
if [ "$STARTUPLINECOUNTTRIM" -eq 0 ]
then
cru a "${SCRIPT_NAME}_trimDB" "$defTrimDB_Mins $defTrimDB_Hour * * * $theScriptFilePath trimdb"
fi
;;
delete)
STARTUPLINECOUNT="$(cru l | grep -c "#${SCRIPT_NAME}#")"
if [ "$STARTUPLINECOUNT" -gt 0 ]; then
if [ "$STARTUPLINECOUNT" -gt 0 ]
then
cru d "$SCRIPT_NAME"
fi
STARTUPLINECOUNTGEN="$(cru l | grep -c "#${SCRIPT_NAME}_generate#")"
if [ "$STARTUPLINECOUNTGEN" -gt 0 ]; then
if [ "$STARTUPLINECOUNTGEN" -gt 0 ]
then
cru d "${SCRIPT_NAME}_generate"
fi
STARTUPLINECOUNTTRIM="$(cru l | grep -c "#${SCRIPT_NAME}_trimDB#")"
if [ "$STARTUPLINECOUNTTRIM" -gt 0 ]; then
if [ "$STARTUPLINECOUNTTRIM" -gt 0 ]
then
cru d "${SCRIPT_NAME}_trimDB"
fi
;;
Expand Down