Skip to content

Commit 5dfcdb6

Browse files
Update MerlinAU.sh
1 parent 1eca4e9 commit 5dfcdb6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

MerlinAU.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ 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="${SETTINGS_DIR}/changelog.txt"
9596
readonly SHARED_SETTINGS_FILE="${ADDONS_PATH}/custom_settings.txt"
9697
readonly SHARED_WEB_DIR="$(readlink -f /www/user)"
9798
readonly SCRIPT_WEB_DIR="${SHARED_WEB_DIR}/$SCRIPT_NAME"
@@ -2341,6 +2342,7 @@ _CreateSymLinks_()
23412342
ln -sf "$CONFIG_FILE" "${SCRIPT_WEB_DIR}/config.htm" 2>/dev/null
23422343
ln -sf "$HELPER_JSFILE" "${SCRIPT_WEB_DIR}/checkHelper.js" 2>/dev/null
23432344
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
23442346
}
23452347

23462348
##----------------------------------------##
@@ -7185,8 +7187,7 @@ _ManageChangelogMerlin_()
71857187
fi
71867188
cp -fp "$changeLogFile" "${SETTINGS_DIR}/changelog.txt"
71877189
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
7190+
ln -sf "${SETTINGS_DIR}/changelog.txt" "${SCRIPT_WEB_DIR}/changelog.htm" 2>/dev/null
71907191
return 0
71917192
}
71927193

@@ -7246,8 +7247,7 @@ _ManageChangelogGnuton_()
72467247
fi
72477248
cp -fp "$changeLogFile" "${SETTINGS_DIR}/changelog.txt"
72487249
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
7250+
ln -sf "${SETTINGS_DIR}/changelog.txt" "${SCRIPT_WEB_DIR}/changelog.htm" 2>/dev/null
72517251
return 1
72527252
}
72537253

0 commit comments

Comments
 (0)