Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 41BD717FED for ; Sat, 25 Apr 2015 19:39:14 +0000 (UTC) Received: (qmail 51050 invoked by uid 500); 25 Apr 2015 19:39:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 51008 invoked by uid 500); 25 Apr 2015 19:39:14 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 50999 invoked by uid 99); 25 Apr 2015 19:39:14 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Apr 2015 19:39:14 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id EB0CDAC00A4 for ; Sat, 25 Apr 2015 19:39:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1676059 - /directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java Date: Sat, 25 Apr 2015 19:39:13 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150425193913.EB0CDAC00A4@hades.apache.org> Author: seelmann Date: Sat Apr 25 19:39:13 2015 New Revision: 1676059 URL: http://svn.apache.org/r1676059 Log: DIRSERVER-2065: Make apacheds.sh executable in tar.gz Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java?rev=1676059&r1=1676058&r2=1676059&view=diff ============================================================================== --- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java (original) +++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java Sat Apr 25 19:39:13 2015 @@ -34,6 +34,7 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.BZip2; import org.apache.tools.ant.taskdefs.GZip; import org.apache.tools.ant.taskdefs.Tar; +import org.apache.tools.ant.taskdefs.Tar.TarFileSet; import org.apache.tools.ant.taskdefs.Zip; import org.codehaus.plexus.util.FileUtils; @@ -306,8 +307,17 @@ public class ArchiveInstallerCommand ext Tar tarTask = new Tar(); tarTask.setProject( project ); tarTask.setDestFile( tarFile ); - tarTask.setBasedir( getTargetDirectory() ); - tarTask.setIncludes( getArchiveDirectory().getName() + ALL_FILES ); + + TarFileSet nonExecutables = tarTask.createTarFileSet(); + nonExecutables.setDir( getTargetDirectory() ); + nonExecutables.setIncludes( getArchiveDirectory().getName() + ALL_FILES ); + nonExecutables.setExcludes( getArchiveDirectory().getName() + "/**/*.sh" ); + + TarFileSet executables = tarTask.createTarFileSet(); + executables.setDir( getTargetDirectory() ); + executables.setIncludes( getArchiveDirectory().getName() + "/**/*.sh" ); + executables.setFileMode( "755" ); + tarTask.execute(); }