Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAIN: adds MacOS support (testing) #666

Open
wants to merge 39 commits into
base: zmb
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5e0b7c6
MAIN: adds MacOS support (testing)
grm34 Jun 24, 2022
2e87dda
Merge branch 'zmb' into mac
grm34 Jun 24, 2022
aaacac2
Merge branch 'zmb' into mac
grm34 Jun 25, 2022
33c0a2e
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
c3037de
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
4aa66be
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
e7e3680
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
2adbc3c
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
e35ddf6
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
1534de5
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
4cd8395
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
0353785
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
8cdb55a
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
df3cd00
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
f900707
Merge branch 'zmb' into mac
grm34 Jun 26, 2022
c4177b6
Merge branch 'zmb' into mac
grm34 Jun 27, 2022
894d08e
Merge branch 'zmb' into mac
grm34 Jun 27, 2022
2f60121
Merge branch 'zmb' into mac
grm34 Jul 1, 2022
d124f66
Adds brew package manager (macOS)
grm34 Jul 2, 2022
9024a3f
Merge branch 'zmb' into mac
grm34 Jul 2, 2022
488530c
Merge branch 'zmb' into mac
grm34 Jul 2, 2022
5c26542
Merge branch 'zmb' into mac
grm34 Jul 14, 2022
3fd6297
Merge branch 'zmb' into mac
grm34 Jul 30, 2022
610a0c1
Merge branch 'zmb' into mac
grm34 Jul 30, 2022
23f26f0
Merge branch 'zmb' into mac
grm34 Jul 31, 2022
493d0d8
Merge branch 'zmb' into mac
grm34 Aug 14, 2022
d1d91e9
Merge branch 'zmb' into mac
grm34 Aug 15, 2022
56e1f00
Merge branch 'zmb' into mac
grm34 Aug 28, 2022
dc59655
Merge branch 'zmb' into mac
grm34 Aug 28, 2022
0778a9a
Merge branch 'zmb' into mac
grm34 Sep 14, 2022
157ae38
Merge branch 'zmb' into mac
grm34 Oct 27, 2022
2e89f72
Merge branch 'zmb' into mac
grm34 Oct 27, 2022
7cbae7f
Merge branch 'zmb' into mac
grm34 Oct 27, 2022
bf61caf
Merge branch 'zmb' into mac
grm34 Oct 30, 2022
e43a0c9
Merge branch 'zmb' into mac
grm34 Nov 11, 2022
1deeccf
Merge branch 'zmb' into mac
grm34 Nov 11, 2022
b95cdf6
Merge branch 'zmb' into mac
grm34 Nov 11, 2022
7bfe618
Merge branch 'zmb' into mac
grm34 Jan 30, 2023
6bb1cde
Merge branch 'zmb' into mac
grm34 Jan 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ INCLUDED=(init.spectrum.rc dtbo.img dts/qcom/sm8150-v2.dtb dts/qcom/sm8150-erofs
# LINKER CHECK
# Ensures host supports selected toolchain
# =========================================
HOST_LINKER="True"
HOST_LINKER="False"

# LINK TIME OPTIMIZATION (LTO)
# Make sure to use a compatible compiler
Expand Down
7 changes: 4 additions & 3 deletions src/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

# Ensures proper use
if ! [[ $(uname -s) =~ ^(Linux|GNU*)$ ]]; then
echo "ERROR: run ZenMaxBuilder Installer on Linux" >&2
if ! [[ $(uname -s) =~ ^(Linux|GNU*|Darwin)$ ]]; then
echo "ERROR: run ZenMaxBuilder Installer on Linux or MacOS" >&2
exit 1
elif ! [[ -t 0 ]]; then
echo "ERROR: run ZenMaxBuilder Installer from a terminal" >&2
Expand Down Expand Up @@ -108,8 +108,9 @@ _get_pm_and_missing_dependencies() {
[emerge]="sudo emerge -1 -y"
[zypper]="sudo zypper install -y"
[dnf]="sudo dnf install -y"
[brew]="sudo brew install -y"
)
pm_list=(pacman yum emerge zypper dnf pkg apt)
pm_list=(pacman yum emerge zypper dnf brew pkg apt)
for manager in "${pm_list[@]}"; do
if which "$manager" &>/dev/null; then
IFS=" "; pm="${pm_install_cmds[$manager]}"
Expand Down
4 changes: 2 additions & 2 deletions src/zmb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
# -------------------------------------------------------------------

# Ensures proper use
if ! [[ $(uname -s) =~ ^(Linux|GNU*)$ ]]; then
echo "ERROR: run ZenMaxBuilder on Linux" >&2
if ! [[ $(uname -s) =~ ^(Linux|GNU*|Darwin)$ ]]; then
echo "ERROR: run ZenMaxBuilder on Linux or MacOS" >&2
exit 1
elif ! [[ -t 0 ]]; then
echo "ERROR: run ZenMaxBuilder from a terminal" >&2
Expand Down