From 22f992aa5edf39039bc8dd7ef5274dbdd4d777bb Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Mon, 18 Aug 2025 16:27:00 -0700 Subject: feat: use data dir for all data --- .gitignore | 7 +------ mcsh.sh | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 55ea3a1..d915ed7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -assets -libraries +mcsh logs -natives -run -versions -profiles.json diff --git a/mcsh.sh b/mcsh.sh index 88f6f85..62837c9 100755 --- a/mcsh.sh +++ b/mcsh.sh @@ -2,14 +2,14 @@ set -euo pipefail IFS=$'\n\t' -DATA_DIR="." +DATA_DIR="./mcsh" mkdir -p "$DATA_DIR" -VERSIONS_DIR="versions" -LIBRARIES_DIR="libraries" -NATIVES_DIR="natives" -ASSETS_DIR="assets" -GAME_DIR="run" +VERSIONS_DIR="$DATA_DIR/versions" +LIBRARIES_DIR="$DATA_DIR/libraries" +NATIVES_DIR="$DATA_DIR/natives" +ASSETS_DIR="$DATA_DIR/assets" +GAME_DIR="$DATA_DIR/run" function auth ( CLIENT_ID="9e97542c-b7d5-4a02-a656-4559dad4590a" @@ -173,11 +173,11 @@ function launch ( function replace_placeholders { cat - | sed \ - -e "s/\${versions_directory}/$VERSIONS_DIR/g" \ - -e "s/\${libraries_directory}/$LIBRARIES_DIR/g" \ - -e "s/\${natives_directory}/$NATIVES_DIR/g" \ - -e "s/\${assets_root}/$ASSETS_DIR/g" \ - -e "s/\${game_directory}/$GAME_DIR/g" \ + -e "s:\${versions_directory}:$VERSIONS_DIR:g" \ + -e "s:\${libraries_directory}:$LIBRARIES_DIR:g" \ + -e "s:\${natives_directory}:$NATIVES_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" \ -- cgit v1.2.3