gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-27 19:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hard-coded default distrib directory.

Browse Source
This commit is contained in:
Nick Brassel 2025-04-21 17:26:46 +10:00
parent 1fb6323a0d
commit d10d637762
No known key found for this signature in database
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
util/env-bootstrap.sh
View File

@ -316,12 +316,12 @@ __EOT__
fi fi
# Download the toolchain release to the toolchains location # Download the toolchain release to the toolchains location
echo "Downloading compiler toolchain..." >&2 echo "Downloading compiler toolchains..." >&2
local target_file="$QMK_DISTRIB_DIR/$(basename "$toolchain_url")" local target_file="$QMK_DISTRIB_DIR/$(basename "$toolchain_url")"
download_url "$toolchain_url" "$target_file" download_url "$toolchain_url" "$target_file"
# Extract the toolchain # Extract the toolchain
echo "Extracting compiler toolchain to '$QMK_DISTRIB_DIR'..." >&2 echo "Extracting compiler toolchains to '$QMK_DISTRIB_DIR'..." >&2
tar xf "$target_file" -C "$QMK_DISTRIB_DIR" --strip-components=1 tar xf "$target_file" -C "$QMK_DISTRIB_DIR" --strip-components=1
} }
@ -350,6 +350,23 @@ __EOT__
rm -f "$QMK_DISTRIB_DIR"/*.tar.zst || true rm -f "$QMK_DISTRIB_DIR"/*.tar.zst || true
} }
default_distrib_dir() {
case $(fn_os) in
macos)
echo "$HOME/Library/Application Support/qmk"
;;
linux)
echo "$HOME/.local/share/qmk"
;;
windows)
echo "/opt/qmk"
;;
*)
echo "No default installation directory for this OS." >&2
exit 1
esac
}
# Set the Python version we want to use with the QMK CLI # Set the Python version we want to use with the QMK CLI
export PYTHON_TARGET_VERSION=3.13 export PYTHON_TARGET_VERSION=3.13
@ -358,16 +375,16 @@ __EOT__
if [ "$(uname -o 2>/dev/null || true)" = "Msys" ]; then if [ "$(uname -o 2>/dev/null || true)" = "Msys" ]; then
export TMPDIR="$(cygpath -w "$TMP")" export TMPDIR="$(cygpath -w "$TMP")"
export UV_INSTALL_DIR=${UV_INSTALL_DIR:-/opt/uv} export UV_INSTALL_DIR=${UV_INSTALL_DIR:-/opt/uv}
export QMK_DISTRIB_DIR=${QMK_DISTRIB_DIR:-/opt/qmk}
export UV_TOOL_DIR=${UV_TOOL_DIR:-"$QMK_DISTRIB_DIR/tools"} export UV_TOOL_DIR=${UV_TOOL_DIR:-"$QMK_DISTRIB_DIR/tools"}
fi fi
# Work out where we want to install the distribution and tools # Work out where we want to install the distribution and tools
export QMK_DISTRIB_DIR=${QMK_DISTRIB_DIR:-$(printf 'import platformdirs\nprint(platformdirs.user_data_dir("qmk"))' | uv run --quiet --python $PYTHON_TARGET_VERSION --with platformdirs -)} export QMK_DISTRIB_DIR=${QMK_DISTRIB_DIR:-$(default_distrib_dir)}
script_parse_args "$@" script_parse_args "$@"
echo "This script will install \`uv\` to ${UV_INSTALL_DIR:-the default location}, and the QMK CLI, toolchains, and flashing utilities to ${QMK_DISTRIB_DIR}." echo "This QMK CLI installation script will install \`uv\` to ${UV_INSTALL_DIR:-the default location}, the QMK CLI to the \`uv\` tools"
echo "directory, as well as toolchains and flashing utilities to '${QMK_DISTRIB_DIR}'."
[ -z "${SKIP_PACKAGE_MANAGER:-}" ] || { preinstall_delay || exit 1; } [ -z "${SKIP_PACKAGE_MANAGER:-}" ] || { preinstall_delay || exit 1; }
[ -n "${SKIP_PACKAGE_MANAGER:-}" ] || install_package_manager_deps [ -n "${SKIP_PACKAGE_MANAGER:-}" ] || install_package_manager_deps
[ -n "${SKIP_UV:-}" ] || install_uv [ -n "${SKIP_UV:-}" ] || install_uv