Update to 0.91

packages/inkscape.xml

@@ -2,23 +2,23 @@
 <packages>
     <package id="inkscape"
              name="Inkscape"
-             revision="6"
+             revision="7"
              reboot="false"
              priority="10">
- 
+        <variable name="PKG_VERSION" value="0.91" />
-        <variable name="PKG_VERSION" value="0.48.5" />
+        <variable architecture="x86" name="OLD_INSTALL_PATH" value="%PROGRAMFILES%\Inkscape" />
-        <variable name="PKG_REV" value="1" />
+        <variable architecture="x64" name="OLD_INSTALL_PATH" value="%PROGRAMFILES(x86)%\Inkscape" />
-        <variable architecture="x86" name="INSTALL_PATH" value="%PROGRAMFILES%\Inkscape" />
-        <variable architecture="x64" name="INSTALL_PATH" value="%PROGRAMFILES(x86)%\Inkscape" />
 
         <check type="uninstall" condition="exists" path="Inkscape %PKG_VERSION%" />
 
-        <install cmd='"%SOFTWARE%\inkscape\Inkscape-%PKG_VERSION%-%PKG_REV%-win32.exe" /S' />
+        <install include="remove" />
+        <install architecture="x86" cmd='msiexec /qn /i "%SOFTWARE%\inkscape\inkscape-%PKG_VERSION%.msi"' />
+        <install architecture="x64" cmd='msiexec /qn /i "%SOFTWARE%\inkscape\inkscape-%PKG_VERSION%-x64.msi"' />
         <install cmd='%COMSPEC% /C del /q /f "%ALLUSERSPROFILE%\Bureau\Inkscape.lnk"'>
             <exit code="0" />
             <exit code="1" />
         </install>
-        <install cmd='%COMSPEC% /C del /q /f "%PUBLIC%\Desktop\Inkscape.lnk"'>
+        <install cmd='%COMSPEC% /C del /q /f "%PUBLIC%\Desktop\Inkscape %PKG_VERSION%.lnk"'>
             <exit code="0" />
             <exit code="1" />
         </install>
@@ -27,6 +27,12 @@
 
         <downgrade include="install" />
 
-        <remove cmd='"%INSTALL_PATH%\uninstall.exe" /S' />
+        <remove cmd='%COMSPEC% /C IF EXIST "%OLD_INSTALL_PATH%\uninstall.exe" "%OLD_INSTALL_PATH%\uninstall.exe" /S' />
+        <remove architecture="x86" cmd='msiexec /qn /norestart /x "%SOFTWARE%\inkscape\inkscape-%PKG_VERSION%.msi"'>
+          <exit code='any' />
+        </remove>
+        <remove architecture="x64" cmd='msiexec /qn /norestart /x "%SOFTWARE%\inkscape\inkscape-%PKG_VERSION%-64.msi"'>
+          <exit code='any' />
+        </remove>
     </package>
 </packages>