Просмотр исходного кода

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>
Jacob Gerega 1 месяц назад
Родитель
Сommit
9f278c692f

+ 28 - 28
.devcontainer/devcontainer.json

@@ -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"
 }

+ 1 - 1
.prettierrc.json

@@ -1,3 +1,3 @@
 {
-  "plugins": ["prettier-plugin-sh"]
+	"plugins": ["prettier-plugin-sh"]
 }

+ 10 - 10
.vscode/extensions.json

@@ -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"
+	]
 }

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

@@ -173,7 +173,7 @@ executabledir="${serverfiles}"
 executable="./srcds_run.sh"
 servercfgdir="${systemdir}/cfg"
 servercfg="${selfname}.cfg"
-servercfgdefault="server.cfg"
+servercfgdefault="server.sample.cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory

+ 3 - 0
lgsm/modules/install_config.sh

@@ -530,6 +530,9 @@ elif [ "${shortname}" == "ios" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 	fn_list_config_locations
+elif [ "${shortname}" == "jbep3" ]; then
+	fn_default_config_local
+	fn_list_config_locations
 elif [ "${shortname}" == "jc2" ]; then
 	array_configs+=(config.lua)
 	fn_default_config_remote