Author: brett Date: Fri Dec 30 03:05:30 2011 New Revision: 1225733 URL: http://svn.apache.org/viewvc?rev=1225733&view=rev Log: fix coflicts and common failure for installing using the MOJO until we fully move to the MSI
Modified: incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java Modified: incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1225733&r1=1225732&r2=1225733&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java Fri Dec 30 03:05:30 2011 @@ -258,6 +258,7 @@ public class VsInstallerMojo { if ( installationLocation == null ) { +/* For now, reserve the "program files" default for the MSI - typically admin permissions will cause these to conflict String programFilesPath = System.getenv( "PROGRAMFILES" ); if ( programFilesPath != null && programFilesPath.length() != 0 ) @@ -276,6 +277,8 @@ public class VsInstallerMojo { installationLocation = new File( System.getProperty( "user.home" ), "NPanday/bin" ); } +*/ + installationLocation = new File( System.getProperty( "user.home" ), "NPanday/bin" ); } else {