From 9fa8bb921e6a535643ebaf05092be45b920fb610 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 16 Mar 2002 04:24:55 +0000 Subject: [PATCH] Decouple tar package from myrmidon by cloning Os.isFamily behaviour git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271866 13f79535-47bb-0310-9956-ffa450edef68 --- .../myrmidon/src/java/org/apache/aut/tar/TarEntry.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java index 11a7f308f..e16a815d4 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java +++ b/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java @@ -9,7 +9,7 @@ package org.apache.aut.tar; import java.io.File; import java.util.Date; -import org.apache.aut.nativelib.Os; +import java.util.Locale; /** * This class represents an entry in a Tar archive. It consists of the entry's @@ -181,7 +181,9 @@ public class TarEntry String name = file.getPath(); // Strip off drive letters! - if( Os.isFamily( Os.OS_FAMILY_WINDOWS) ) + final String osName = + System.getProperty( "os.name" ).toLowerCase( Locale.US ); + if( -1 != osName.indexOf( "netware" ) ) { if( name.length() > 2 ) { @@ -196,7 +198,7 @@ public class TarEntry } } } - else if( Os.isFamily( Os.OS_FAMILY_NETWARE) ) + else if( -1 != osName.indexOf( "netware" ) ) { final int colon = name.indexOf( ':' ); if( colon != -1 )