Browse Source
* feat: refactor update comparison output for consistency and clarity - Replaced direct echo statements with fn_print functions for uniformity in output formatting across multiple update scripts. - Ensured lockfile creation uses the correct syntax for variable expansion. - Moved lock file to the same location to ensure monitor doesnt reboot at the wrong time - Updated remote build information display to enhance readability and maintain consistency in logging. - Removed unnecessary echo commands to streamline the output process. * Refactor remote build version handling across multiple modules - Updated variable names from 'remotebuildversion' to 'remotebuild' for consistency. - Adjusted logic to check for remote build availability using the new variable name. - Modified output messages to reflect the change in variable naming. - Ensured all modules (update_mc.sh, update_mcb.sh, update_mta.sh, update_pmc.sh, update_ts3.sh, update_ut99.sh, update_vints.sh, update_xnt.sh) are aligned with the new naming convention for better readability and maintainability. * fix(alert): resolve issue with servername not always being listed in title * Moved `info_distro.sh`, `info_game.sh`, and `info_messages.sh` calls to the top of the `fn_alert_log` function for better clarity. * Updated `alerticon` assignment to maintain consistency in alert information handling. * fix(alert_discord): remove "More info" field from Discord alert JSON * Eliminated the "More info" field to streamline the alert message. * This change enhances the clarity of the alert by focusing on essential information. * fix(alert): improve update alert messaging for clarity * Updated alert messages in `fn_alert_update` and `fn_alert_update_failed` for better readability. * Changed alert action from `update-request` to `update-restart-request` in `fn_monitor_check_update_source`. * remove inline * fix(alert): Correct grammar in update alert message * Changed "an LinuxGSM update" to "a LinuxGSM update" for grammatical accuracy. * typo * fix(alert_discord): Add inline property to "Is my Game Server Online?" field * Ensures proper formatting of the Discord alert message. * Improves the display of the server status information. * fix(pd): increase timeout for termbin.com connection * fix(alert_discord): reorder fields in Discord alert JSON * Changed the order of fields in the Discord alert JSON structure. * Updated the "More info" and "Is my Game Server Online?" fields for better clarity. * revert back to factorio.com Co-authored-by: Copilot <[email protected]> * Standardizes alert messages across platforms Ensures consistency in alert messages across Discord, NTFY, Pushover, Rocketchat, Slack, and Telegram. Updates Discord alerts to include server hostname and time, removes redundant formatting. Standardizes plain-text alert formatting for NTFY. Refactors Pushover messages to use consistent HTML formatting. Streamlines Rocketchat and Slack messages by removing duplicate server info and adding optional link support. * Removes Hostname from alert messages Removes the Hostname field from various alert messages (Discord, Gotify, IFTTT, ntfy, Pushbullet, Pushover, Rocketchat, Slack, Telegram). The hostname was deemed redundant or unnecessary in the context of these alerts. Relates to #4696 * Configures shellcheckrc filename Configures the Super-Linter action to use `.shellcheckrc` as the BASH_FILE_NAME. This ensures that shellcheck uses the correct configuration file for bash script linting. Fixes #4696 * Disables shellcheck errors and removes variable Disables specific shellcheck errors to allow certain coding patterns and removes an unused variable from the super-linter workflow. This improves the linter's signal-to-noise ratio and reduces unnecessary checks. Relates to #4696 * Fixes and improves server list validation scripts Addresses issues in the server list validation scripts: - Fixes potential issues with parsing curl custom arguments in telegram alerts. - Corrects the shortname array generation. - Implements more robust checks for validating game icons. - Ensures the consistency of server counts across different CSV files. * Fixes glibc check and mod selection logic Corrects glibc version comparison to properly handle version strings. Improves mod installation and removal by validating user input against available options, providing a more robust selection process. This prevents errors caused by invalid mod names and enhances the user experience. Updates arithmetic expression syntax for better compatibility. * Fixes cache control for dev-debug mode Updates the handling of cache control headers in dev-debug mode. The `nocache` variable is changed to an array to correctly pass multiple headers to `curl`. This resolves issues with cached versions of files being used when dev-debug is enabled, ensuring that the latest versions are always fetched. Fixes #4696 * Allows spaces in steamcmdcommand variable Parses steamcmdcommand as an array to allow spaces in the variable. This prevents issues when the user wants to pass arguments with spaces to the steamcmd executable. * Addresses various script improvements Addresses multiple improvements across various scripts: - Fixes Valheim unstripped_corlib override by commenting out the lines in the config files. - Improves process identification for source and goldsrc engines using `pgrep`. - Enhances backup file identification using `find` with `-maxdepth 1` and `-type f`. - Fixes glibc version comparison logic in multiple files. - Improves UT2K4 key installation script by using printf for writing the key to the file. - Corrects the mod info extraction logic to correctly identify mod entries. - Improves amxmodx file installation/removal logic to prevent duplicate entries. - Fixes server info retrieval to handle spaces in the server list. Relates to #4696 * Fixes mono repo install exit code check Corrects the mono repo install exit code check to use the dedicated monorepoexitcode variable, ensuring accurate error detection. Updates the exit trap to preserve the original exit status, preventing potential loss of information when handling script termination. * Refactors and reorders core modules Improves module loading by reordering and refactoring the core modules. This change addresses inconsistencies and improves the overall structure of how core modules are handled within the system. Some fix scripts were renamed to match the module name. * Makes scripts executable Changes file permissions to make shell scripts executable. This ensures that the scripts can be run directly. Addresses a pre-existing issue. Related to #4696 * Adds explicit permissions to workflows Specifies explicit permissions for GitHub Actions workflows to enhance security and control access to resources. This ensures that each workflow only has the necessary permissions, following the principle of least privilege. * Fixes output redirection and URL parsing Corrects output redirection in GitHub Actions workflows by enclosing the $GITHUB_OUTPUT variable in quotes, preventing potential issues with variable expansion. Ensures proper URL parsing in workflows by enclosing the URL within quotes, addressing potential parsing errors. Fixes #4696 * Applies code formatting for consistency Applies Prettier formatting to the codebase for improved readability and consistency. Addresses minor code style inconsistencies across several files. * Fixes minor formatting and logic issues Addresses various minor issues including: - Standardizes indentation in `.editorconfig` for different file types. - Simplifies Prettier configuration. - Updates image links in `README.md`. - Ensures newline character at end of `.csv` files. - Corrects a conditional statement in `command_fastdl.sh`. - Corrects a conditional statement in `info_messages.sh`. - Updates server query protocols in `query_gsquery.py`. * Configures and disables linters Adds YAML linting configuration and disables unnecessary linters to streamline the CI/CD process and reduce noise from irrelevant checks. * Improves documentation and linting Updates documentation links to be enclosed in angle brackets, preventing markdown rendering issues. Configures markdownlint to align with repository standards and avoid common false positives. The updated links in the documentation ensure they are correctly interpreted by markdown parsers, improving user experience. The markdownlint configuration fine-tunes linting rules to better match the project's existing style and conventions, reducing noise from irrelevant warnings. * Fixes typos and improves code consistency Addresses various typos and inconsistencies across multiple files, enhancing code readability and maintainability. Adds codespell and flake8 configurations for linting. Relates to #4696 * Excludes workflow files from Prettier formatting Prevents Prettier from formatting workflow files due to GitHub token restrictions, as the token used by the Prettier auto-commit action lacks permissions to update files within the `.github/workflows/` directory. * chore(prettier): format code * Updates Super-Linter configuration Improves Super-Linter's reliability by switching to linting the entire codebase instead of relying on git history. This change also addresses potential transient fetch failures from GitHub. Additionally, this commit expands the ignored paths in codespell and disables some linters to improve performance and reduce false positives. --------- Co-authored-by: Copilot <[email protected]> Co-authored-by: dgibbs64 <[email protected]>pull/4895/head
Daniel Gibbs
3 months ago
committed by
GitHub
GitHub
186 changed files with 1155 additions and 1097 deletions
@ -1,30 +1,30 @@ |
|||
{ |
|||
"name": "BASH Dev Container", |
|||
"image": "mcr.microsoft.com/devcontainers/base:ubuntu", |
|||
"features": { |
|||
"ghcr.io/devcontainers-community/npm-features/prettier:1": { |
|||
"plugins": "prettier-plugin-sh" |
|||
}, |
|||
"ghcr.io/devcontainers-extra/features/actionlint:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/checkov:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/shellcheck:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/yamllint:2": {}, |
|||
"ghcr.io/devcontainers/features/github-cli:1": {} |
|||
}, |
|||
"customizations": { |
|||
"vscode": { |
|||
"extensions": [ |
|||
"DavidAnson.vscode-markdownlint", |
|||
"editorconfig.editorconfig", |
|||
"esbenp.prettier-vscode", |
|||
"github.vscode-github-actions", |
|||
"GitHub.vscode-pull-request-github", |
|||
"redhat.vscode-yaml", |
|||
"timonwong.shellcheck", |
|||
"yzhang.markdown-all-in-one" |
|||
] |
|||
} |
|||
}, |
|||
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template" |
|||
"name": "BASH Dev Container", |
|||
"image": "mcr.microsoft.com/devcontainers/base:ubuntu", |
|||
"features": { |
|||
"ghcr.io/devcontainers-community/npm-features/prettier:1": { |
|||
"plugins": "prettier-plugin-sh" |
|||
}, |
|||
"ghcr.io/devcontainers-extra/features/actionlint:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/checkov:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/shellcheck:1": {}, |
|||
"ghcr.io/devcontainers-extra/features/yamllint:2": {}, |
|||
"ghcr.io/devcontainers/features/github-cli:1": {} |
|||
}, |
|||
"customizations": { |
|||
"vscode": { |
|||
"extensions": [ |
|||
"DavidAnson.vscode-markdownlint", |
|||
"editorconfig.editorconfig", |
|||
"esbenp.prettier-vscode", |
|||
"github.vscode-github-actions", |
|||
"GitHub.vscode-pull-request-github", |
|||
"redhat.vscode-yaml", |
|||
"timonwong.shellcheck", |
|||
"yzhang.markdown-all-in-one" |
|||
] |
|||
} |
|||
}, |
|||
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template" |
|||
} |
|||
|
|||
@ -0,0 +1,11 @@ |
|||
[codespell] |
|||
# Skip data tables that contain many short server identifiers (e.g. "fof", "nd") |
|||
skip = |
|||
lgsm/data/*.csv, |
|||
package-lock.json, |
|||
*/package-lock.json, |
|||
node_modules, |
|||
*/node_modules/* |
|||
|
|||
# Ignore common identifiers/acronyms and extensions used throughout LinuxGSM |
|||
ignore-words-list = distroname,fof,nd,sav,parms,ThirdParty |
|||
@ -0,0 +1,2 @@ |
|||
[flake8] |
|||
max-line-length = 120 |
|||
@ -0,0 +1,23 @@ |
|||
# Configuration for markdownlint (used by Super Linter) |
|||
|
|||
# MD041: README starts with HTML badges in this repo. |
|||
MD041: false |
|||
|
|||
# MD051: GitHub heading anchor generation can differ (emoji, punctuation). |
|||
MD051: false |
|||
|
|||
# MD013: The project documentation frequently contains long URLs/commands. |
|||
MD013: false |
|||
|
|||
# MD033: The main README uses inline HTML for badges. |
|||
MD033: false |
|||
|
|||
# Match existing list formatting in this repo. |
|||
MD007: |
|||
indent: 4 |
|||
|
|||
MD030: |
|||
ul_single: 3 |
|||
ol_single: 2 |
|||
ul_multi: 3 |
|||
ol_multi: 2 |
|||
@ -0,0 +1 @@ |
|||
disable=SC2154,SC2034 |
|||
@ -0,0 +1,25 @@ |
|||
extends: default |
|||
|
|||
rules: |
|||
document-start: disable |
|||
truthy: disable |
|||
|
|||
line-length: |
|||
max: 200 |
|||
level: warning |
|||
allow-non-breakable-words: true |
|||
allow-non-breakable-inline-mappings: true |
|||
|
|||
braces: |
|||
min-spaces-inside: 0 |
|||
max-spaces-inside: 1 |
|||
min-spaces-inside-empty: 0 |
|||
max-spaces-inside-empty: 0 |
|||
|
|||
empty-lines: |
|||
max: 2 |
|||
max-start: 0 |
|||
max-end: 0 |
|||
|
|||
comments: |
|||
min-spaces-from-content: 1 |
|||
@ -0,0 +1,3 @@ |
|||
# Prettier auto-commit runs with GITHUB_TOKEN (GitHub App). |
|||
# GitHub blocks that token from creating/updating anything under .github/workflows. |
|||
.github/workflows/** |
|||
@ -1,3 +1,3 @@ |
|||
{ |
|||
"plugins": ["prettier-plugin-sh"] |
|||
"plugins": ["prettier-plugin-sh"] |
|||
} |
|||
|
|||
@ -1,3 +1,3 @@ |
|||
{ |
|||
"plugins": ["prettier-plugin-sh"] |
|||
"plugins": ["prettier-plugin-sh"] |
|||
} |
|||
|
|||
@ -1 +1 @@ |
|||
disable=SC2154 |
|||
disable=SC2154,SC2034 |
|||
|
|||
@ -1,12 +1,12 @@ |
|||
{ |
|||
"recommendations": [ |
|||
"DavidAnson.vscode-markdownlint", |
|||
"editorconfig.editorconfig", |
|||
"esbenp.prettier-vscode", |
|||
"github.vscode-github-actions", |
|||
"GitHub.vscode-pull-request-github", |
|||
"redhat.vscode-yaml", |
|||
"timonwong.shellcheck", |
|||
"yzhang.markdown-all-in-one" |
|||
] |
|||
"recommendations": [ |
|||
"DavidAnson.vscode-markdownlint", |
|||
"editorconfig.editorconfig", |
|||
"esbenp.prettier-vscode", |
|||
"github.vscode-github-actions", |
|||
"GitHub.vscode-pull-request-github", |
|||
"redhat.vscode-yaml", |
|||
"timonwong.shellcheck", |
|||
"yzhang.markdown-all-in-one" |
|||
] |
|||
} |
|||
|
|||
|
|
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue