hunabgit/local_machine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Joplin, old Mac, and Fedora WiFi runbooks; simplify JA3 Whisky scripts and hotspot recovery.

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
ahauimix
2026-06-19 22:26:33 +03:00
parent 1938b7c743
commit 4bc9629a09
381 changed files with 3442 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/games/gog/run-ja3.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Запуск Jagged Alliance 3 (GOG) без Steam client.
# Запуск Jagged Alliance 3 (GOG) без Steam client — Whisky GOG-Install.
set -euo pipefail
GOG_DIR="$(cd "$(dirname "$0")" && pwd)"
# shellcheck source=config.sh
@@ -26,7 +26,7 @@ if [[ "${JA3_IGNORE_SWAP:-0}" == "1" ]]; then
elif ! gog_swap_guard_ja3_launch "${JA3_SWAP_SOFT_MB:-1200}" "${JA3_SWAP_HARD_MB:-4096}"; then
used="$(gog_swap_used_mb 2>/dev/null || echo '?')"
echo ""
echo "Swap ~${used}MB — bash ${GOG_DIR}/reset-ja3-crossover.sh или reboot Mac"
echo "Swap ~${used}MB — bash ${GOG_DIR}/reset-ja3-whisky.sh или reboot Mac"
echo "Или: JA3_IGNORE_SWAP=1 bash ${GOG_DIR}/run-ja3.sh"
exit 1
fi
@@ -46,18 +46,6 @@ if ! ja3_gptk_available && ! ja3_bottle_uses_d3dmetal; then
fi
fi
CX="/Applications/CrossOver.app/Contents/SharedSupport/CrossOver"
if [[ ! -x "${CX}/bin/wine" ]]; then
:
elif [[ ! -f "${HOME}/Library/Application Support/CrossOver/Bottles/JA3-GOG/drive_c/GOG Games/Jagged Alliance 3/JA3.exe" ]]; then
echo ""
echo "ℹ️ JA3 (D3D12) на Mac: Whisky/Gcenx не поддерживает D3DMetal."
echo " brew install --cask crossover"
echo " bash ${GOG_DIR}/setup-ja3-crossover.sh && bash ${GOG_DIR}/run-ja3-crossover.sh"
echo ""
fi
# Whisky D3DMetal path — не работает для JA3/D3D12 на Gcenx (см. JA3_MAC_WITHOUT_GALAXY.md)
if ja3_gptk_available || ja3_bottle_uses_d3dmetal; then
bash "${GOG_DIR}/prepare-ja3-d3dmetal.sh" >/dev/null 2>&1 || true
fi
@@ -80,14 +68,9 @@ if [[ -f "${BOTTLE_DIR}/drive_c/Program Files (x86)/GOG Galaxy/GalaxyClientServi
fi
if ja3_gptk_available || ja3_bottle_uses_d3dmetal; then
echo "⚠️ Whisky D3DMetal не поддерживает JA3/D3D12 (Gcenx без D3DMetal hooks)."
echo " Используйте: bash ${GOG_DIR}/run-ja3-crossover.sh"
echo ""
fi
if ja3_gptk_available || ja3_bottle_uses_d3dmetal; then
echo "Запуск JA3 (Whisky — эксперимент; D3D12 → CrossOver)…"
echo "Запуск JA3 (Whisky + D3DMetal)…"
else
echo "Запуск JA3 (GOG, DXVK D3D11 fallback; без Steam.app)…"
echo "Запуск JA3 (Whisky, DXVK D3D11 fallback; без Steam.app)…"
fi
echo "Cmd+Tab → wine64. В графике: отключить heat haze."
echo "(лог «Steam … GOG» = GOG API-шим, не Steam client)"
@@ -98,6 +81,5 @@ else
_ja3_args="${JA3_EXTRA_ARGS:--unpacked -graphicsapi d3d11}"
fi
# start /d — CWD = папка игры (CommonLua/, иначе «graphics subsystem»/autorun.lua из Whisky Run)
# innoextract не запускает Inno-постскрипты; -unpacked + CommonLua на диске обязательны
# shellcheck disable=SC2086
exec "${WINE64}" start /d "C:\\GOG Games\\Jagged Alliance 3" "${JA3_WIN}" ${_ja3_args}