directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r639906 - /directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Date Fri, 21 Mar 2008 23:19:53 GMT
Author: felixk
Date: Fri Mar 21 16:19:52 2008
New Revision: 639906

URL: http://svn.apache.org/viewvc?rev=639906&view=rev
Log:
Fix messed up of use of configuration and system(default) properties.

Modified:
    directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java

Modified: directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=639906&r1=639905&r2=639906&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
(original)
+++ directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Fri Mar 21 16:19:52 2008
@@ -234,7 +234,7 @@
             { rpmBuilder.getAbsolutePath(), "-ba", "--define", "_topdir " + target.getRpmTopDir().getAbsolutePath(),
rpmConfigurationFile.getAbsolutePath() };
         MojoHelperUtils.exec( cmd, target.getLayout().getBaseDirectory().getParentFile(),
target.isDoSudo() );
         String rpmName = target.getApplication().getName() + "-" + version + "-0.i386.rpm";
-        File srcFile = new File( System.getProperty("user.home") + "/rpmbuild/RPMS/i386",
rpmName );
+        File srcFile = new File( target.getRpmTopDir(), "RPMS/i386/" + rpmName );
         File dstFile = null;
 
         if ( target.getFinalName() == null )
@@ -630,7 +630,7 @@
 
         String[] cmd = new String[]
             { "tar", "-zcvf",
-                System.getProperty("user.home") + "/rpmbuild/SOURCES/" + target.getApplication().getName()
+ "-" + version + ".tar.gz",
+            target.getRpmTopDir().getAbsolutePath() + "/SOURCES/" + target.getApplication().getName()
+ "-" + version + ".tar.gz",
                 sourcesDir.getAbsolutePath() };
 
         MojoHelperUtils.exec( cmd, target.getLayout().getBaseDirectory().getParentFile(),
target.isDoSudo() );



Mime
View raw message