From 73a8298528b981531cc4ff7081f1b60c9c315793 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Wed, 11 Apr 2001 22:44:19 +0000 Subject: [PATCH] Updated ant to get environment from MacOS X Submitted By: Archit Shah git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268940 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Execute.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index a5993385e..e26de50bb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -179,6 +179,18 @@ public class Execute { String osname = System.getProperty("os.name").toLowerCase(); if ( osname.indexOf("mac os") >= 0 ) { // Mac + // Determine if we are running under OS X + try { + float version = Float.parseFloat(System.getProperty("os.version")); + if (version >= 10.0) { + // OS X - just line UNIX + String[] cmd = {"/usr/bin/env"}; + return cmd; + } + } catch (NumberFormatException e) { + // fall through to OS 9 + } + // OS 9 and previous // TODO: I have no idea how to get it, someone must fix it String[] cmd = null; return cmd;