From 1fbd85ee6baaf58013fcee9c8e3187058463c846 Mon Sep 17 00:00:00 2001
From: gnattu <gnattuoc@me.com>
Date: Sun, 3 Mar 2024 13:42:46 +0800
Subject: [PATCH] fix: dependencies

---
 builder/images/macos/00-dep.sh                     | 14 ++++++++------
 .../images/macos/{06-gettext.sh => 01-gettext.sh}  |  0
 builder/images/macos/{01-glib2.sh => 02-glib2.sh}  |  0
 .../images/macos/{02-brotli.sh => 03-brotli.sh}    |  0
 .../images/macos/{03-libpng.sh => 04-libpng.sh}    |  0
 .../macos/{04-libunibreak.sh => 05-libunibreak.sh} |  0
 builder/images/macos/{05-pcre2.sh => 06-pcre2.sh}  |  1 -
 7 files changed, 8 insertions(+), 7 deletions(-)
 rename builder/images/macos/{06-gettext.sh => 01-gettext.sh} (100%)
 rename builder/images/macos/{01-glib2.sh => 02-glib2.sh} (100%)
 rename builder/images/macos/{02-brotli.sh => 03-brotli.sh} (100%)
 rename builder/images/macos/{03-libpng.sh => 04-libpng.sh} (100%)
 rename builder/images/macos/{04-libunibreak.sh => 05-libunibreak.sh} (100%)
 rename builder/images/macos/{05-pcre2.sh => 06-pcre2.sh} (99%)

diff --git a/builder/images/macos/00-dep.sh b/builder/images/macos/00-dep.sh
index a75b410ab..615663ebc 100644
--- a/builder/images/macos/00-dep.sh
+++ b/builder/images/macos/00-dep.sh
@@ -2,10 +2,12 @@
 
 ffbuild_macbase() {
   brew install wget subversion mercurial autoconf automake cmake meson ninja pkg-config coreutils gcc make python-setuptools pcre2 libtool gnu-sed gnu-tar nasm quilt
-  cp "$BUILDER_ROOT"/images/base/git-mini-clone.sh /usr/local/bin/git-mini-clone
-  chmod +x /usr/local/bin/git-mini-clone
-  cp "$BUILDER_ROOT"/images/base/retry-tool.sh /usr/local/bin/retry-tool
-  chmod +x /usr/local/bin/retry-tool
-  cp "$BUILDER_ROOT"/images/base/check-wget.sh /usr/local/bin/check-wget
-  chmod +x  /usr/local/bin/check-wget
+  mkdir /opt/ffbuild/bin
+  cp "$BUILDER_ROOT"/images/base/git-mini-clone.sh /opt/ffbuild/bin/git-mini-clone
+  chmod +x /opt/ffbuild/bin/git-mini-clone
+  cp "$BUILDER_ROOT"/images/base/retry-tool.sh /opt/ffbuild/bin/retry-tool
+  chmod +x /opt/ffbuild/bin/retry-tool
+  cp "$BUILDER_ROOT"/images/base/check-wget.sh /opt/ffbuild/bin/check-wget
+  chmod +x  /opt/ffbuild/bin/check-wget
+  export PATH="/opt/ffbuild/bin:$PATH"
 }
diff --git a/builder/images/macos/06-gettext.sh b/builder/images/macos/01-gettext.sh
similarity index 100%
rename from builder/images/macos/06-gettext.sh
rename to builder/images/macos/01-gettext.sh
diff --git a/builder/images/macos/01-glib2.sh b/builder/images/macos/02-glib2.sh
similarity index 100%
rename from builder/images/macos/01-glib2.sh
rename to builder/images/macos/02-glib2.sh
diff --git a/builder/images/macos/02-brotli.sh b/builder/images/macos/03-brotli.sh
similarity index 100%
rename from builder/images/macos/02-brotli.sh
rename to builder/images/macos/03-brotli.sh
diff --git a/builder/images/macos/03-libpng.sh b/builder/images/macos/04-libpng.sh
similarity index 100%
rename from builder/images/macos/03-libpng.sh
rename to builder/images/macos/04-libpng.sh
diff --git a/builder/images/macos/04-libunibreak.sh b/builder/images/macos/05-libunibreak.sh
similarity index 100%
rename from builder/images/macos/04-libunibreak.sh
rename to builder/images/macos/05-libunibreak.sh
diff --git a/builder/images/macos/05-pcre2.sh b/builder/images/macos/06-pcre2.sh
similarity index 99%
rename from builder/images/macos/05-pcre2.sh
rename to builder/images/macos/06-pcre2.sh
index 40e454872..b3d5c0fc3 100644
--- a/builder/images/macos/05-pcre2.sh
+++ b/builder/images/macos/06-pcre2.sh
@@ -13,7 +13,6 @@ ffbuild_macbase() {
           --enable-pcre2grep-libz \
           --enable-pcre2grep-libbz2 \
           --enable-jit
-
   make -j$(nproc)
   make install
 }