Skip to content

Commit 9f278c6

Browse files
jgerega107dgibbs64
andauthored
feat(newserver): Jabroni Brawl: Episode 3 (#4702)
* Added jbep3server * fix(jbep3): add distro deps entries and game icon * fix(jbep3): bootstrap config from server.sample.cfg * chore(prettier): format code --------- Co-authored-by: Daniel Gibbs <me@danielgibbs.co.uk> Co-authored-by: dgibbs64 <dgibbs64@users.noreply.github.com>
1 parent 946cd6f commit 9f278c6

5 files changed

Lines changed: 43 additions & 40 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"name": "BASH Dev Container",
3-
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4-
"features": {
5-
"ghcr.io/devcontainers-community/npm-features/prettier:1": {
6-
"plugins": "prettier-plugin-sh"
7-
},
8-
"ghcr.io/devcontainers-extra/features/actionlint:1": {},
9-
"ghcr.io/devcontainers-extra/features/checkov:1": {},
10-
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
11-
"ghcr.io/devcontainers-extra/features/shellcheck:1": {},
12-
"ghcr.io/devcontainers-extra/features/yamllint:2": {},
13-
"ghcr.io/devcontainers/features/github-cli:1": {}
14-
},
15-
"customizations": {
16-
"vscode": {
17-
"extensions": [
18-
"DavidAnson.vscode-markdownlint",
19-
"editorconfig.editorconfig",
20-
"esbenp.prettier-vscode",
21-
"github.vscode-github-actions",
22-
"GitHub.vscode-pull-request-github",
23-
"redhat.vscode-yaml",
24-
"timonwong.shellcheck",
25-
"yzhang.markdown-all-in-one"
26-
]
27-
}
28-
},
29-
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
2+
"name": "BASH Dev Container",
3+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4+
"features": {
5+
"ghcr.io/devcontainers-community/npm-features/prettier:1": {
6+
"plugins": "prettier-plugin-sh"
7+
},
8+
"ghcr.io/devcontainers-extra/features/actionlint:1": {},
9+
"ghcr.io/devcontainers-extra/features/checkov:1": {},
10+
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
11+
"ghcr.io/devcontainers-extra/features/shellcheck:1": {},
12+
"ghcr.io/devcontainers-extra/features/yamllint:2": {},
13+
"ghcr.io/devcontainers/features/github-cli:1": {}
14+
},
15+
"customizations": {
16+
"vscode": {
17+
"extensions": [
18+
"DavidAnson.vscode-markdownlint",
19+
"editorconfig.editorconfig",
20+
"esbenp.prettier-vscode",
21+
"github.vscode-github-actions",
22+
"GitHub.vscode-pull-request-github",
23+
"redhat.vscode-yaml",
24+
"timonwong.shellcheck",
25+
"yzhang.markdown-all-in-one"
26+
]
27+
}
28+
},
29+
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
3030
}

.prettierrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"plugins": ["prettier-plugin-sh"]
2+
"plugins": ["prettier-plugin-sh"]
33
}

.vscode/extensions.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"recommendations": [
3-
"DavidAnson.vscode-markdownlint",
4-
"editorconfig.editorconfig",
5-
"esbenp.prettier-vscode",
6-
"github.vscode-github-actions",
7-
"GitHub.vscode-pull-request-github",
8-
"redhat.vscode-yaml",
9-
"timonwong.shellcheck",
10-
"yzhang.markdown-all-in-one"
11-
]
2+
"recommendations": [
3+
"DavidAnson.vscode-markdownlint",
4+
"editorconfig.editorconfig",
5+
"esbenp.prettier-vscode",
6+
"github.vscode-github-actions",
7+
"GitHub.vscode-pull-request-github",
8+
"redhat.vscode-yaml",
9+
"timonwong.shellcheck",
10+
"yzhang.markdown-all-in-one"
11+
]
1212
}

lgsm/config-default/config-lgsm/jbep3server/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ executabledir="${serverfiles}"
173173
executable="./srcds_run.sh"
174174
servercfgdir="${systemdir}/cfg"
175175
servercfg="${selfname}.cfg"
176-
servercfgdefault="server.cfg"
176+
servercfgdefault="server.sample.cfg"
177177
servercfgfullpath="${servercfgdir}/${servercfg}"
178178

179179
## Backup Directory

lgsm/modules/install_config.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,9 @@ elif [ "${shortname}" == "ios" ]; then
530530
fn_default_config_remote
531531
fn_set_config_vars
532532
fn_list_config_locations
533+
elif [ "${shortname}" == "jbep3" ]; then
534+
fn_default_config_local
535+
fn_list_config_locations
533536
elif [ "${shortname}" == "jc2" ]; then
534537
array_configs+=(config.lua)
535538
fn_default_config_remote

0 commit comments

Comments
 (0)