Armin Schrenk 2 سال پیش
والد
کامیت
68d32957e4
2فایلهای تغییر یافته به همراه4 افزوده شده و 5 حذف شده
  1. 2 3
      dist/win/contrib/version170-migrate-settings.ps1
  2. 2 2
      dist/win/resources/main.wxs

+ 2 - 3
dist/win/contrib/version170-migrate-settings.ps1

@@ -12,7 +12,7 @@ Get-ChildItem $profileList | ForEach-Object { $_.GetValue("ProfileImagePath") }
     if($profileNameMatches.Count -eq 1) {
         #check if the last path part is contained in the local user name list
         #otherwise do not touch it
-        return $localUsers.Contains($matches[0].Groups[1].Value)
+        return $localUsers.Contains($profileNameMatches[0].Groups[1].Value)
     } else {
         return $false;
     }
@@ -22,9 +22,8 @@ Get-ChildItem $profileList | ForEach-Object { $_.GetValue("ProfileImagePath") }
         #No settings file, nothing to do.
         return;
     }
-
     $settings = Get-Content -Path $settingsPath | ConvertFrom-Json
-    if($settings.preferredVolumeImpl -eq "FUSE") {
+    if($settings.preferredVolumeImpl -ne "FUSE") {
         #Fuse not used, nothing to do
         return;
     }

+ 2 - 2
dist/win/resources/main.wxs

@@ -133,7 +133,7 @@
     <CustomAction Id="PatchWebDAV" Impersonate="no" ExeCommand="[INSTALLDIR]patchWebDAV.bat" Directory="INSTALLDIR" Execute="deferred" Return="asyncWait" />
 
     <!-- Special Settings migration for 1.7.0 -->
-    <CustomAction Id="170MigrateSettings" Impersonate="no" ExeCommand="[INSTALLDIR]version170-migrate-settings.bat" Directory="INSTALLDIR" Execute="deferred" Return="asyncWait" />
+    <CustomAction Id="V170MigrateSettings" Impersonate="no" ExeCommand="[INSTALLDIR]version170-migrate-settings.bat" Directory="INSTALLDIR" Execute="deferred" Return="asyncWait" />
 
     <!-- Running App detection and exit -->
     <Property Id="FOUNDRUNNINGAPP" Admin="yes"/>
@@ -185,7 +185,7 @@
       <RemoveExistingProducts After="InstallValidate"/>
 
       <Custom Action="PatchWebDAV" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
-      <Custom Action="170MigrateSettings" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
+      <Custom Action="V170MigrateSettings" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
     </InstallExecuteSequence>
 
     <WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />