refactor: move launcher info from jq filter to script

2 files changed, 6 insertions, 10 deletions

diff --git a/mcsh.sh b/mcsh.sh
index 778ff66..d3e57cb 100755
--- a/mcsh.sh
+++ b/mcsh.sh
@@ -74,8 +74,11 @@ function launch (
             -e "s/\${versions_directory}/$VERSIONS_DIR/g" \
             -e "s/\${libraries_directory}/$LIBRARIES_DIR/g" \
             -e "s/\${natives_directory}/$NATIVES_DIR/g" \
-            -e "s/\${assets_directory}/$ASSETS_DIR/g" \
-            -e "s/\${game_directory}/$GAME_DIR/g"
+            -e "s/\${assets_root}/$ASSETS_DIR/g" \
+            -e "s/\${game_directory}/$GAME_DIR/g" \
+            \
+            -e "s/\${launcher_name}/mcsh/g" \
+            -e "s/\${launcher_version}/v0.1.0/g"
     }
 
     printf 'starting game :3\n' >&2
diff --git a/meta.jq b/meta.jq
index 138ef15..c849674 100644
--- a/meta.jq
+++ b/meta.jq
@@ -25,20 +25,13 @@ def replace_placeholders: {
 
     "assets_index_name": .assets,
 
-    "assets_root": "${assets_directory}",
-    #"game_directory": "run",
-    #"natives_directory": "natives",
-
     "classpath": (. as $root | [
         .libraries[] | apply_optional | "${libraries_directory}/" + .downloads.artifact.path
     ] + ["${versions_directory}/\($root.id)/client.jar"] | join(":")),
     "clientid": "idfk",
 
     # log4j config path
-    "path": "${versions_directory}/\(.id)/log4j.xml",
-
-    "launcher_name": "mcsh",
-    "launcher_version": "v0.1.0"
+    "path": "${versions_directory}/\(.id)/log4j.xml"
 } as $strings | walk(if type == "string" then
     gsub("\\${(?<key>.*)}"; "\($strings[.key] // "${\(.key)}")")
 end);