directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r895629 - in /directory/daemon/trunk/plugin/src/main: java/org/apache/directory/daemon/installers/solarispkg/ resources/org/apache/directory/daemon/installers/solarispkg/
Date Mon, 04 Jan 2010 14:07:17 GMT
Author: pamarcelot
Date: Mon Jan  4 14:07:17 2010
New Revision: 895629

URL: http://svn.apache.org/viewvc?rev=895629&view=rev
Log:
Fix for DIRSERVER-1454 (Solaris Packing broken).

Modified:
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/pkginfo
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java?rev=895629&r1=895628&r2=895629&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
(original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
Mon Jan  4 14:07:17 2010
@@ -77,7 +77,7 @@
      */
     public void execute() throws MojoExecutionException, MojoFailureException
     {
-        // Verifying the target is macosx
+        // Verifying the target is solaris
         if ( !target.getOsName().equals( "solaris" ) )
         {
             log.warn( "Solaris PKG installer can only be targeted for Solaris platform!"
);
@@ -241,7 +241,7 @@
         catch ( IOException e )
         {
             log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed while trying to generate the DMG: " +
e.getMessage() );
+            throw new MojoFailureException( "Failed while trying to generate the PKG: " +
e.getMessage() );
         }
 
         log.info( "Solaris PKG generated at " + new File( imagesDirectory, finalName ) );

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/pkginfo
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/pkginfo?rev=895629&r1=895628&r2=895629&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/pkginfo
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/pkginfo
Mon Jan  4 14:07:17 2010
@@ -1,7 +1,7 @@
 PKG="apacheds"
 NAME="ApacheDS"
 VERSION="${version}"
-ARCH="x86"
+ARCH="${osArch}"
 CLASSES="none"
 CATEGORY="utility"
 VENDOR="Apache Software Foundation"

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall?rev=895629&r1=895628&r2=895629&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/preinstall
Mon Jan  4 14:07:17 2010
@@ -20,7 +20,7 @@
 set -e
 
 # Creating the apacheds user (only if needed)
-USER=`eval "id -u -n apacheds 2>/dev/null || :"`
+USER=`getent passwd apacheds | cut -d: -f1` 
 if [ ! "Xapacheds" = "X$USER" ]
 then
 	/usr/sbin/groupadd apacheds >/dev/null 2>&1 || :



Mime
View raw message