[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fdabbac2e9d9d4b6cda129c3640f192da35868e5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 09:55:43 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 09:55:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fdabbac2

scripts/bootstrap-prefix: try to hide java dialog on OSX

 scripts/bootstrap-prefix.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d6b53f1..e1e75fb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -981,6 +981,19 @@ bootstrap_stage1() { (
                        } > "${ROOT}"/tmp/usr/bin/nm
                        chmod 755 "${ROOT}"/tmp/usr/bin/nm
                        ;;
+               *-darwin*)
+                       # Recent Mac OS X have a nice popup to install java when
+                       # it's called without being installed, this doesn't 
stop the
+                       # process from going, but keeps popping up a dialog 
during
+                       # the bootstrap process, which is slightly anoying.
+                       # Nevertheless, we don't want Java when it's installed 
to be
+                       # detected, so hide during the stage builds
+                       {
+                               echo "#!$(type -P false)"
+                       } > "${ROOT}"/tmp/usr/bin/java
+                       cp "${ROOT}"/tmp/usr/bin/java{,c}
+                       chmod 755 "${ROOT}"/tmp/usr/bin/java{,c}
+                       ;;
        esac
        # important to have our own (non-flawed one) since Python (from
        # Portage) and binutils use it