mirror of
https://github.com/OpenMW/openmw.git
synced 2026-01-04 13:43:07 +00:00
f155b0199e
https://gitlab.com/OpenMW/openmw/-/merge_requests/4759#note_2606465930 was marked as resolved without really being resolved, so bypassed normal review and was merged prematurely. We tell developers to run these scripts on their machines, so it's rude to install things we don't have to over the top of an existing installation. If the existing installation was via brew via the default sources, then it's clever enough not to break things, but if it's using custom sources or the install is outside of brew, it'll either break or overwrite what's there. The three tools we've historically checked before overwriting all have an upstream MacOS distribution that isn't through brew, so it's decently likely that they exist, and we've never agreed to drop support for them. I went a little further than the original code: * I added a check before overwriting brew itself. I don't know whether the install script would notice this anyway. * I added a check to ensure it's specifically Qt 6.x that's already installed as we dropped support for Qt 5. * I added the checks back to both scripts even though !4759 only removed them from one. There only used to be one script, and when it was split, the checks only made it to one copy. I could have gone further by adding checks for other tools before we install them, but we didn't have these in the past and I couldn't be bothered. Try ARCHPREFERENCE environment variable Go back to using subshell ARCHPREFERENCE won't retroactively relaunch the current shell. Also use /usr/local/bin/brew as the x86_64 version we just installed isn't added to the path by default. Fresh shell for brew installer? escape things better This commit message was very nearly just emoji or a rant about sh-compatible shells. what is going on? Nested quotes? |
||
|---|---|---|
| .. | ||
| macos | ||
| activate_msvc.sh | ||
| ActivateMSVC.ps1 | ||
| before_install.android.sh | ||
| before_install.macos.sh | ||
| before_script.android.sh | ||
| before_script.linux.sh | ||
| before_script.macos.sh | ||
| before_script.msvc.sh | ||
| check_clang_format.sh | ||
| check_cmake_format.sh | ||
| check_file_names.sh | ||
| check_package.osx.sh | ||
| check_qt_translations.sh | ||
| github.env | ||
| install_debian_deps.sh | ||
| org.openmw.OpenMW.devel.yaml | ||
| run_integration_tests.sh | ||
| Store-Symbols.ps1 | ||
| teal_ci.sh | ||
| ubuntu_gcc_preprocess.sh | ||