Skip to content

Functional Improvement #35

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
Dec 20, 2025
Merged

Functional Improvement #35

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# uiScribe

## v1.4.10
### Updated on 2025-Dec-16
### Updated on 2025-Dec-19

## About
uiScribe updates the System Log page to show log files created by Scribe (syslog-ng). Requires [**Scribe**](https://github.com/cynicastic/scribe)
Expand Down
110 changes: 78 additions & 32 deletions uiScribe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
## Forked from https://github.com/jackyaz/uiScribe ##
## ##
########################################################
# Last Modified: 2025-Dec-16
# Last Modified: 2025-Dec-19
#-------------------------------------------------------

########### Shellcheck directives ##########
Expand All @@ -30,7 +30,7 @@
### Start of script variables ###
readonly SCRIPT_NAME="uiScribe"
readonly SCRIPT_VERSION="v1.4.10"
readonly SCRIPT_VERSTAG="25121623"
readonly SCRIPT_VERSTAG="25121920"
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 @@ -543,18 +543,19 @@ Create_Symlinks()
fi
_Update_ListOf_UserCheck_LogFiles_

rm -f "$SCRIPT_WEB_DIR/"*.htm 2>/dev/null
ln -s "${optVarLogDir}/messages" "$SCRIPT_WEB_DIR/messages.htm" 2>/dev/null
ln -s "$userCheckLogList" "$SCRIPT_WEB_DIR/logs_user.htm" 2>/dev/null
ln -s "${optVarLogDir}/messages" "$SCRIPT_WEB_DIR/messages.htm" 2>/dev/null

_Get_LogRotate_FileInfoList_
ln -s "$logRotateInfoListJS" "${SCRIPT_WEB_DIR}/logRotateInfoList.js" 2>/dev/null

rm -f "$SCRIPT_WEB_DIR/"*.log.htm 2>/dev/null

while IFS='' read -r theLogFile || [ -n "$theLogFile" ]
do
ln -s "$theLogFile" "$SCRIPT_WEB_DIR/$(basename "$theLogFile").htm" 2>/dev/null
done < "$filteredLogList"

_Get_LogRotate_FileInfoList_
ln -s "$logRotateInfoListJS" "${SCRIPT_WEB_DIR}/logRotateInfoList.js" 2>/dev/null

if [ ! -d "$SHARED_WEB_DIR" ]; then
ln -s "$SHARED_DIR" "$SHARED_WEB_DIR" 2>/dev/null
fi
Expand Down Expand Up @@ -869,9 +870,9 @@ _Get_LogRotate_ConfigFile_()
fi
done

if "$configFileOK"
then echo "$theConfigFile"
else _Get_LogRotate_TempConfig_ "$1"
if ! "$configFileOK"
then _Get_LogRotate_TempConfig_ "$1"
else _PrependGlobalDirectives_ "$theConfigFile"
fi
}

Expand Down Expand Up @@ -939,7 +940,8 @@ _DoPostRotateCleanup_()
##-------------------------------------##
_RotateAllLogFiles_Preamble_()
{
local lineNumBegin lineNumEndin
local lineNumInsert
local tmpLogRotateAction="${HOMEdir}/${SCRIPT_NAME}_tempLogRotateAction_$$.txt"

doPostRotateCleanup=false
_Generate_ListOf_Filtered_LogFiles_
Expand All @@ -963,16 +965,22 @@ _RotateAllLogFiles_Preamble_()
fi
cp -fp "$logRotateGlobalConf" "${SCRIPT_DIR}/${logRotateGlobalName}.SAVED"

lineNumEndin="$(grep -wn -m1 "^endscript" "$logRotateGlobalConf" | cut -d':' -f1)"
lineNumBegin="$(grep -wn -m1 "^postrotate" "$logRotateGlobalConf" | cut -d':' -f1)"
if [ -z "$lineNumBegin" ] || [ -z "$lineNumEndin" ]
then return 1
fi
lineNumEndin="$((lineNumEndin + 1))"
sed -i "${lineNumEndin}i }" "$logRotateGlobalConf"
sed -i "${lineNumBegin}i {" "$logRotateGlobalConf"
lineNumBegin="$((lineNumBegin - 1))"
sed -i "${lineNumBegin}r $noConfigLogList" "$logRotateGlobalConf"
lineNumInsert="$(grep -wn -m1 "^endscript" "$logRotateGlobalConf" | cut -d':' -f1)"
[ -z "$lineNumInsert" ] && return 1
lineNumInsert="$((lineNumInsert + 1))"

cat "$noConfigLogList" > "$tmpLogRotateAction"
cat <<EOF >> "$tmpLogRotateAction"
{
lastaction
/usr/bin/killall -HUP syslog-ng
endscript
}

EOF

sed -i "${lineNumInsert}r $tmpLogRotateAction" "$logRotateGlobalConf"
rm -f "$tmpLogRotateAction"
doPostRotateCleanup=true
}

Expand Down Expand Up @@ -1024,6 +1032,10 @@ _Run_RotateLogFile_()

sleep 1
"$doPostRotateCleanup" && _DoPostRotateCleanup_
if echo "$logRotateConf" | grep -qE "^${optTempDir}/RotateLog_.*"
then
rm -f "$logRotateConf"
fi
_Get_LogRotate_FileInfoList_
}

Expand Down Expand Up @@ -1089,14 +1101,44 @@ _Get_LogRotate_TempConfig_()
then
echo ; return 1
fi
local logFileName="$1" theConfigFile
theConfigFile="${optTempDir}/RotateLog_${logFileName%.*}.conf"
rm -f "$theConfigFile"
local logFileName="$1" configFPath
configFPath="${optTempDir}/RotateLog_${logFileName%.*}.conf"
rm -f "$configFPath"

echo "${optVarLogDir}/$logFileName" > "$configFPath"
_Set_LogRotate_ConfigOptions_ >> "$configFPath"
chmod 644 "$configFPath"
echo "$configFPath"
}

echo "${optVarLogDir}/$logFileName" > "$theConfigFile"
_Set_LogRotate_ConfigOptions_ >> "$theConfigFile"
chmod 644 "$theConfigFile"
echo "$theConfigFile"
##-------------------------------------##
## Added by Martinski W. [2025-Dec-18] ##
##-------------------------------------##
_PrependGlobalDirectives_()
{
if [ $# -eq 0 ] || [ -z "$1" ] || [ ! -s "$1" ]
then echo ; return 1
fi
local configFPath

if [ ! -s "$logRotateGlobalConf" ] || \
grep -qE "$logFilesRegExp" "$logRotateGlobalConf"
then
if [ ! -s "${logRotateExamplesDir}/$logRotateGlobalName" ]
then echo "$1" ; return 1
fi
cp -fp "${logRotateExamplesDir}/$logRotateGlobalName" "$logRotateGlobalConf"
chmod 644 "$logRotateGlobalConf"
fi

configFPath="${optTempDir}/RotateLog_${1##*/}.conf"
rm -f "$configFPath"

cat "$logRotateGlobalConf" > "$configFPath"
sed -i '/^#EOF#/d' "$configFPath"
cat "$1" >> "$configFPath"
chmod 644 "$configFPath"
echo "$configFPath"
}

##-------------------------------------##
Expand Down Expand Up @@ -1773,7 +1815,7 @@ then
fi

##----------------------------------------##
## Modified by Martinski W. [2025-Dec-13] ##
## Modified by Martinski W. [2025-Dec-19] ##
##----------------------------------------##
case "$1" in
install)
Expand Down Expand Up @@ -1804,6 +1846,9 @@ case "$1" in
then
_Run_RotateLogFile_ "$logFileName"
_ReleaseFLock_
else
echo "var logRotateStatus = 'ERROR';" > "$logRotateStatusJS"
echo "ERROR: Unable to acquire lock to run logrotate." > "$logRotateStatusT"
fi
elif echo "$3" | grep -qE "^${SCRIPT_NAME}ClearLog_.*"
then
Expand All @@ -1812,12 +1857,13 @@ case "$1" in
then
_Run_ClearLogFile_ "$logFileName"
_ReleaseFLock_
else
echo "var logRotateStatus = 'ERROR';" > "$logRotateStatusJS"
echo "ERROR: Unable to acquire lock to run logrotate." > "$logRotateStatusT"
fi
elif echo "$3" | grep -qE "^${SCRIPT_NAME}LogFileInfoList"
then
_Generate_ListOf_Filtered_LogFiles_
_Get_LogRotate_FileInfoList_
_Update_ListOf_UserCheck_LogFiles_
Create_Symlinks
fi
exit 0
;;
Expand Down