Merge pull request #22222 from twangboy/fix_installer

Fixed problem with nested directories
saltstack · Apr 1, 2015 · 9ab3d5e · 9ab3d5e
2 parents c8378ff + 8615e8d
commit 9ab3d5e
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/pkg/windows/installer/Salt-Minion-Setup.nsi b/pkg/windows/installer/Salt-Minion-Setup.nsi
@@ -229,8 +229,19 @@ FunctionEnd
 
 Function .onInit
 
+MessageBox MB_OK "$INSTDIR"
+
+  confFind:
   IfFileExists "$INSTDIR\conf\minion" confFound confNotFound
 
+  confNotFound:
+    ${If} $INSTDIR == "c:\salt\bin\Scripts"
+      StrCpy $INSTDIR "C:\salt"
+      goto confFind
+    ${Else}
+      goto confReallyNotFound
+    ${EndIf}
+
   confFound:
     FileOpen $0 "$INSTDIR\conf\minion" r
 
@@ -256,7 +267,7 @@ Function .onInit
     EndOfFile:
       FileClose $0
 
-  confNotFound:
+  confReallyNotFound:
     Push $R0
     Push $R1
     Push $R2