Skip to content

Code Improvements #400

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
ExtremeFiretop merged 2 commits into from
Feb 9, 2025
Merged

Code Improvements #400

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44de8bc
Code Improvements
Martinski4GitHub Feb 9, 2025
5e9f15b
Merge branch 'ExtremeFiretop:WebFun' into WebFun
Martinski4GitHub Feb 9, 2025
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
15 changes: 8 additions & 7 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2025-Jan-27
# Last Modified: 2025-Feb-08
###################################################################
set -u

Expand Down Expand Up @@ -91,7 +91,7 @@ readonly CONFIG_FILE="${SETTINGS_DIR}/custom_settings.txt"
readonly SCRIPT_VERPATH="${SETTINGS_DIR}/version.txt"
readonly HELPER_JSFILE="${SETTINGS_DIR}/CheckHelper.js"
readonly SHARED_SETTINGS_FILE="${ADDONS_PATH}/custom_settings.txt"
readonly SHARED_WEB_DIR="$(readlink /www/user)"
readonly SHARED_WEB_DIR="$(readlink -f /www/user)"
readonly SCRIPT_WEB_DIR="${SHARED_WEB_DIR}/$SCRIPT_NAME"
readonly SCRIPT_WEB_ASP_FILE="${SCRIPT_NAME}.asp"
readonly SCRIPT_WEB_ASP_PATH="$SETTINGS_DIR/$SCRIPT_WEB_ASP_FILE"
Expand Down Expand Up @@ -1855,8 +1855,8 @@ _Mount_WebUI_()
echo "$SCRIPT_NAME" > "${SHARED_WEB_DIR}/$(echo "$webPageFile" | cut -f1 -d'.').title"

if [ ! -f "$TEMP_MENU_TREE" ]
then cp -fp "$ORIG_MENU_TREE" "$TEMP_MENU_TREE" ; fi

then cp -fp "$ORIG_MENU_TREE" "$TEMP_MENU_TREE"
fi
sed -i "/url: \"$webPageFile\", tabName: \"$SCRIPT_NAME\"/d" "$TEMP_MENU_TREE"

# Insert new page tab in the 'Administration' menu #
Expand All @@ -1866,7 +1866,7 @@ _Mount_WebUI_()
mount -o bind "$TEMP_MENU_TREE" "$ORIG_MENU_TREE"
flock -u "$WEBUI_LOCKFD"

Say "${GRNct}$SCRIPT_NAME WebUI page was mounted successfully."
Say "${GRNct}$SCRIPT_NAME WebUI page was mounted as $webPageFile successfully."
return 0
}

Expand Down Expand Up @@ -2086,7 +2086,7 @@ _CreateSymLinks_()
}

##----------------------------------------##
## Modified by Martinski W. [2025-Jan-27] ##
## Modified by Martinski W. [2025-Feb-08] ##
##----------------------------------------##
_WriteVarDefToHelperJSFile_()
{
Expand All @@ -2105,7 +2105,8 @@ _WriteVarDefToHelperJSFile_()
elif ! grep -q "^var $1 =.*" "$HELPER_JSFILE"
then
echo "var $1 = ${varValue};" >> "$HELPER_JSFILE"
else
elif ! grep -q "^var $1 = ${varValue};" "$HELPER_JSFILE"
then
sed -i "s/^var $1 =.*/var $1 = ${varValue};/" "$HELPER_JSFILE"
fi
}
Expand Down