From dcd2c4d755aa65e7b9fd47690061cf5266dbe932 Mon Sep 17 00:00:00 2001 From: Dzuelu Date: Wed, 5 Jan 2022 13:18:18 -0500 Subject: [PATCH 1/3] Add fix for mod paths to be relative to arma directory (#1) --- launch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch.py b/launch.py index 12fcc80..7929bae 100644 --- a/launch.py +++ b/launch.py @@ -7,7 +7,7 @@ def mod_param(name, mods): - return ' -{}="{}" '.format(name, ";".join(mods)) + return ' -{}="{}" '.format(name, ";".join(mods)).replace('/arma3/', '') def env_defined(key): From 9565ad1f8b2596c5b41e0db8298915b1b4d566d5 Mon Sep 17 00:00:00 2001 From: Dzuelu Date: Thu, 6 Jan 2022 11:05:18 -0500 Subject: [PATCH 2/3] lowercase mods files after workshop download (#2) * Add fix for mod paths to be relative to arma directory * lowercase mods files after workshop download --- workshop.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workshop.py b/workshop.py index b8c900f..19a2eb0 100644 --- a/workshop.py +++ b/workshop.py @@ -9,8 +9,10 @@ WORKSHOP = "/arma3/steamapps/workshop/content/107410/" USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36" # noqa: E501 +def lowercase_workshop_dir(path: str): + os.system("(cd {} && find . -depth -exec rename -v 's/(.*)\/([^\/]*)/$1\/\L$2/' {{}} \;)".format(path)) -def mod(id): +def download_mod(id): steamcmd = ["/steamcmd/steamcmd.sh"] steamcmd.extend(["+login", os.environ["STEAM_USER"], os.environ["STEAM_PASSWORD"]]) steamcmd.extend(["+force_install_dir", "/arma3"]) @@ -35,8 +37,9 @@ def preset(mod_file): regex = r"filedetails\/\?id=(\d+)\"" matches = re.finditer(regex, html, re.MULTILINE) for _, match in enumerate(matches, start=1): - mod(match.group(1)) + download_mod(match.group(1)) moddir = WORKSHOP + match.group(1) + lowercase_workshop_dir(moddir) mods.append(moddir) keys.copy(moddir) return mods From dea01b404b82b76202a8ea0afde344cff646cea0 Mon Sep 17 00:00:00 2001 From: Dzuelu Date: Thu, 6 Jan 2022 11:59:05 -0500 Subject: [PATCH 3/3] Add rename to docker installs --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 83f05e3..7ec92f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update \ lib32stdc++6 \ lib32gcc1 \ wget \ + rename \ ca-certificates \ && \ apt-get remove --purge -y \