helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make tmpfs dotnet env wrapper bash-3 compatible

Browse source
This commit is contained in:
BruceChen 2026-04-12 20:21:59 +08:00
parent 0a041b37c5
commit e4d71d970b
2 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tools/mcc-env.sh
View file

@ -122,17 +122,15 @@ _mcc_build_root() {
}
_mcc_dotnet_env() {
local -n env_ref="$1"
env_ref=()
if [[ "${MCC_BUILD_MODE:-local}" != "tmpfs" ]]; then
return 0
if [[ "${MCC_BUILD_MODE:-local}" == "tmpfs" ]]; then
local build_root
build_root="$(_mcc_build_root)"
mkdir -p "$build_root"
env MCC_BUILD_ROOT="$build_root" "$@"
return $?
fi
local build_root
build_root="$(_mcc_build_root)"
mkdir -p "$build_root"
env_ref+=("MCC_BUILD_ROOT=$build_root")
"$@"
}
# Helper: convert version to tmux session name (dots -> underscores)
@ -155,10 +153,8 @@ mc-rcon() { bash "$MCC_REPO/tools/mc-rcon.sh" "$@"; }
# --- MCC Build/Run ---
mcc-build() {
local repo_root
local -a dotnet_env
repo_root="$(_mcc_repo_root)"
_mcc_dotnet_env dotnet_env
env "${dotnet_env[@]}" dotnet build "$repo_root/MinecraftClient.sln" -c Release
_mcc_dotnet_env dotnet build "$repo_root/MinecraftClient.sln" -c Release
}
mcc-build-clean() {
if [[ "${MCC_BUILD_MODE:-local}" == "tmpfs" ]]; then
@ -173,7 +169,7 @@ mcc-build-clean() {
mcc-run() {
local port="${1:-25565}"
shift || true
cd "$MCC_REPO" && MCC_FILE_INPUT=1 dotnet run --project MinecraftClient -c Release -- CursorBot - "localhost:${port}" "$@" 2>&1
cd "$MCC_REPO" && _mcc_dotnet_env env MCC_FILE_INPUT=1 dotnet run --project MinecraftClient -c Release -- CursorBot - "localhost:${port}" "$@" 2>&1
}
mcc-cmd() {
local session=""
@ -275,9 +271,18 @@ mcc-reload() {
# --- TUI Mode ---
mcc-tui() {
local port="${1:-25565}"
local cmd_prefix=""
shift || true
tmux new-session -d -s mcc-debug -x 160 -y 50 \
"cd '$MCC_REPO' && dotnet run --project MinecraftClient -c Release -- CursorBot - localhost:${port} $* 2>&1; echo '=== MCC EXITED ==='; sleep 600"
if [[ "${MCC_BUILD_MODE:-local}" == "tmpfs" ]]; then
local build_root
build_root="$(_mcc_build_root)"
mkdir -p "$build_root"
cmd_prefix="MCC_BUILD_ROOT='$build_root' "
fi
_mcc_dotnet_env tmux new-session -d -s mcc-debug -x 160 -y 50 \
"cd '$MCC_REPO' && ${cmd_prefix}dotnet run --project MinecraftClient -c Release -- CursorBot - localhost:${port} $* 2>&1; echo '=== MCC EXITED ==='; sleep 600"
echo "TUI mode launched in tmux session 'mcc-debug'"
echo "Attach: tmux attach -t mcc-debug"
}

3
tools/test-mcc-env.sh
View file

@ -75,6 +75,9 @@ if [[ "$build_root" != "$expected_prefix"* ]]; then
exit 1
fi
dotnet_env_build_root="$(_mcc_dotnet_env env | awk -F= '$1=="MCC_BUILD_ROOT" { print $2 }')"
assert_eq "$build_root" "$dotnet_env_build_root" "dotnet env wrapper exports MCC_BUILD_ROOT"
mkdir -p "$build_root/probe"
mcc-build-clean
[[ ! -e "$build_root/probe" ]]