From 287d60fe1daf4dd39387a96895b2ac91dbeace74 Mon Sep 17 00:00:00 2001 From: Daniel Ceregatti Date: Fri, 3 Nov 2023 17:13:18 -0700 Subject: [PATCH] Refactor install to map, as that's more relevant. Update docs. --- files/bin/{install.sh => map.sh} | 6 +++--- files/custom/README.md | 3 ++- files/mods/1602372402/{install.env => map.env} | 0 files/mods/2415195639/{install.env => map.env} | 0 files/mods/2929038098/{install.env => map.env} | 0 web/bin/dz | 6 +++--- 6 files changed, 8 insertions(+), 7 deletions(-) rename files/bin/{install.sh => map.sh} (80%) rename files/mods/1602372402/{install.env => map.env} (100%) rename files/mods/2415195639/{install.env => map.env} (100%) rename files/mods/2929038098/{install.env => map.env} (100%) diff --git a/files/bin/install.sh b/files/bin/map.sh similarity index 80% rename from files/bin/install.sh rename to files/bin/map.sh index 719d434..a5c1c89 100755 --- a/files/bin/install.sh +++ b/files/bin/map.sh @@ -2,11 +2,11 @@ set -eE -if [ -f /files/mods/${1}/install.env ] +if [ -f /files/mods/${1}/map.env ] then - source /files/mods/${1}/install.env + source /files/mods/${1}/map.env else - echo "install.env not found for mod id ${1}..." + echo "map.env not found for mod id ${1}..." exit 1 fi diff --git a/files/custom/README.md b/files/custom/README.md index 3582923..2d108f7 100644 --- a/files/custom/README.md +++ b/files/custom/README.md @@ -65,7 +65,8 @@ xmlstarlet ed \ > types.xml ``` -Always lint any XML file that is created/merged: +Always lint any XML file that is created/merged (Any output from this command means there is a problem. No output means the XML file is valid): + ```shell xmllint --noout types.xml ``` diff --git a/files/mods/1602372402/install.env b/files/mods/1602372402/map.env similarity index 100% rename from files/mods/1602372402/install.env rename to files/mods/1602372402/map.env diff --git a/files/mods/2415195639/install.env b/files/mods/2415195639/map.env similarity index 100% rename from files/mods/2415195639/install.env rename to files/mods/2415195639/map.env diff --git a/files/mods/2929038098/install.env b/files/mods/2929038098/map.env similarity index 100% rename from files/mods/2929038098/install.env rename to files/mods/2929038098/map.env diff --git a/web/bin/dz b/web/bin/dz index d3fdfbf..2102711 100755 --- a/web/bin/dz +++ b/web/bin/dz @@ -294,11 +294,11 @@ Mods: " map(){ # Install map mpmissions for mods that have them. Presumes a map.env was created for the mod, with the required metadata (git URL, etc.) - if [ -f ${FILES}/mods/${1}/install.env ] + if [ -f ${FILES}/mods/${1}/map.env ] then echo "Installing mpmissions files for mod id ${1}..." - source ${FILES}/mods/${1}/install.env - ${FILES}/bin/install.sh ${1} install + source ${FILES}/mods/${1}/map.env + ${FILES}/bin/map.sh ${1} install fi }