Skip to content

Commit 1eca4e9

Browse files
Update MerlinAU.sh
1 parent 16ae0c8 commit 1eca4e9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

MerlinAU.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ readonly CONFIG_FILE="${SETTINGS_DIR}/custom_settings.txt"
9292
readonly SCRIPT_VERPATH="${SETTINGS_DIR}/version.txt"
9393
readonly HELPER_JSFILE="${SETTINGS_DIR}/CheckHelper.js"
9494
readonly PSWD_CHECK_JS="${SETTINGS_DIR}/PswdCheckStatus.js"
95-
readonly CHANGELOG_PATH="$(ls "${SETTINGS_DIR}"/[Cc]hange[Ll]og* 2>/dev/null | head -n 1)"
9695
readonly SHARED_SETTINGS_FILE="${ADDONS_PATH}/custom_settings.txt"
9796
readonly SHARED_WEB_DIR="$(readlink -f /www/user)"
9897
readonly SCRIPT_WEB_DIR="${SHARED_WEB_DIR}/$SCRIPT_NAME"
@@ -2342,7 +2341,6 @@ _CreateSymLinks_()
23422341
ln -sf "$CONFIG_FILE" "${SCRIPT_WEB_DIR}/config.htm" 2>/dev/null
23432342
ln -sf "$HELPER_JSFILE" "${SCRIPT_WEB_DIR}/checkHelper.js" 2>/dev/null
23442343
ln -sf "$PSWD_CHECK_JS" "${SCRIPT_WEB_DIR}/pswdCheckStatus.js" 2>/dev/null
2345-
ln -sf "$CHANGELOG_PATH" "${SCRIPT_WEB_DIR}/changelog.htm" 2>/dev/null
23462344
}
23472345

23482346
##----------------------------------------##
@@ -7187,6 +7185,8 @@ _ManageChangelogMerlin_()
71877185
fi
71887186
cp -fp "$changeLogFile" "${SETTINGS_DIR}/changelog.txt"
71897187
rm -f "$changeLogFile" "$wgetLogFile"
7188+
CHANGELOG_PATH="$(ls "${SETTINGS_DIR}"/[Cc]hange[Ll]og* 2>/dev/null | head -n 1)"
7189+
ln -sf "$CHANGELOG_PATH" "${SCRIPT_WEB_DIR}/changelog.htm" 2>/dev/null
71907190
return 0
71917191
}
71927192

@@ -7246,6 +7246,8 @@ _ManageChangelogGnuton_()
72467246
fi
72477247
cp -fp "$changeLogFile" "${SETTINGS_DIR}/changelog.txt"
72487248
rm -f "$FW_Changelog_GITHUB" "$wgetLogFile"
7249+
CHANGELOG_PATH="$(ls "${SETTINGS_DIR}"/[Cc]hange[Ll]og* 2>/dev/null | head -n 1)"
7250+
ln -sf "$CHANGELOG_PATH" "${SCRIPT_WEB_DIR}/changelog.htm" 2>/dev/null
72497251
return 1
72507252
}
72517253

0 commit comments

Comments
 (0)