@@ -11,7 +11,7 @@
<excludeFolder url="file://$MODULE_DIR$/doc/izpack" />
<excludeFolder url="file://$MODULE_DIR$/doc/izpack/javadoc" />
</content>
- <orderEntry type="jdk" jdkName="1.5 (1)" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
IzPack.iml
@@ -77,8 +77,8 @@
<component name="IdProvider" IDEtalkID="F66F8E4B88443419F1E5C108B16FCE75" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- <scopes />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
@@ -259,7 +259,9 @@
<component name="ProjectDetails">
<option name="projectName" value="IzPack" />
</component>
- <component name="ProjectFileVersion" converted="true" />
+ <component name="ProjectDictionaryState">
+ <dictionary name="julien" />
+ </component>
<component name="ProjectKey">
<option name="state" value="project:///Users/julien/Code/izpack.git/IzPack.ipr" />
</component>
IzPack.ipr
@@ -99,7 +99,7 @@ public class PrivilegedRunner
}
}
- private boolean canWriteToProgramFiles()
+ public boolean canWriteToProgramFiles()
{
try
{
src/lib/com/izforge/izpack/installer/PrivilegedRunner.java
@@ -21,6 +21,7 @@ package com.izforge.izpack.uninstaller;
import com.izforge.izpack.util.Housekeeper;
import com.izforge.izpack.installer.PrivilegedRunner;
+import com.izforge.izpack.util.OsVersion;
import javax.swing.*;
import java.lang.reflect.Method;
@@ -86,7 +87,7 @@ public class Uninstaller
return;
}
- if (Uninstaller.class.getResource("/exec-admin") != null)
+ if (elevationShouldBeInvestigated())
{
PrivilegedRunner runner = new PrivilegedRunner();
if (runner.isPlatformSupported() && runner.isElevationNeeded())
@@ -117,6 +118,12 @@ public class Uninstaller
}
}
+ private static boolean elevationShouldBeInvestigated()
+ {
+ return (Uninstaller.class.getResource("/exec-admin") != null) ||
+ (OsVersion.IS_WINDOWS && !(new PrivilegedRunner().canWriteToProgramFiles()));
+ }
+
public static void cmduninstall(String[] args)
{
try
src/lib/com/izforge/izpack/uninstaller/Uninstaller.java
5bf16e08975bf721863c3697d9b78b4ef944d52a
jponge
jponge@7d736ef5-cfd4-0310-9c9a-b52d5c14b761
http://github.com/jponge/izpack/commit/1b6ad7462fc3432204bc9bc9e1f621c88df18e09
1b6ad7462fc3432204bc9bc9e1f621c88df18e09
2009-09-30T06:54:54-07:00
2009-09-30T06:54:54-07:00
Fix for IZPACK-387.
git-svn-id: https://svn.codehaus.org/izpack/izpack-src/trunk@2853 7d736ef5-cfd4-0310-9c9a-b52d5c14b761
519e641a864770a2639b10bb5cedb44019f0b89c
jponge
jponge@7d736ef5-cfd4-0310-9c9a-b52d5c14b761