Fix uninstaller silent mode issue

Remove also unecessary files
igat259 · Oct 30, 2016 · c58043e · c58043e
1 parent 2897dee
commit c58043e
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 67 deletions.
diff --git a/PowerEditor/installer/configModel.xml b/PowerEditor/installer/configModel.xml
diff --git a/PowerEditor/installer/langsModel.xml b/PowerEditor/installer/langsModel.xml
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -52,18 +52,6 @@ Function setPathAndOptions
 FunctionEnd
 
 Function copyCommonFiles
-	SetOverwrite on
-	SetOutPath "$TEMP\"
-	File "langsModel.xml"
-	File "configModel.xml"
-	File "stylesGlobalModel.xml"
-	File "stylesLexerModel.xml"
-	File "stylers_remove.xml"
-
-	File "..\bin\langs.model.xml"
-	File "..\bin\config.model.xml"
-	File "..\bin\stylers.model.xml"
-
 	SetOverwrite off
 	SetOutPath "$UPDATE_PATH\"
 	File "..\bin\contextMenu.xml"
@@ -72,7 +60,6 @@ Function copyCommonFiles
 	SetOverwrite on
 	SetOutPath "$INSTDIR\"
 	File "..\bin\langs.model.xml"
-	File "..\bin\config.model.xml"
 	File "..\bin\stylers.model.xml"
 	File "..\bin\contextMenu.xml"
 	File "..\bin\functionList.xml"

diff --git a/PowerEditor/installer/nsisInclude/uninstall.nsh b/PowerEditor/installer/nsisInclude/uninstall.nsh
@@ -119,7 +119,7 @@ SectionEnd
 Var keepUserData
 Function un.doYouReallyWantToKeepData
 	StrCpy $keepUserData "false"
-	MessageBox MB_YESNO "Would you like to keep your custom settings?" IDYES skipRemoveUserData IDNO removeUserData
+	MessageBox MB_YESNO "Would you like to keep your custom settings?" /SD IDNO IDYES skipRemoveUserData IDNO removeUserData
 skipRemoveUserData:
 	StrCpy $keepUserData "true"
 removeUserData:

diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
@@ -73,8 +73,6 @@ copy /Y ..\bin\readme.txt .\minimalist\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\minimalist\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\minimalist\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\minimalist\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\minimalist\
@@ -99,8 +97,6 @@ copy /Y ..\bin\readme.txt .\minimalist64\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\minimalist64\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\minimalist64\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\minimalist64\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\minimalist64\
@@ -146,8 +142,6 @@ copy /Y ..\bin\readme.txt .\zipped.package.release\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\zipped.package.release\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\zipped.package.release\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\zipped.package.release\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\zipped.package.release\
@@ -240,8 +234,6 @@ copy /Y ..\bin\readme.txt .\zipped.package.release64\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\zipped.package.release64\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\zipped.package.release64\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\zipped.package.release64\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\zipped.package.release64\

diff --git a/PowerEditor/installer/stylers_remove.xml b/PowerEditor/installer/stylers_remove.xml
diff --git a/PowerEditor/installer/stylesGlobalModel.xml b/PowerEditor/installer/stylesGlobalModel.xml
diff --git a/PowerEditor/installer/stylesLexerModel.xml b/PowerEditor/installer/stylesLexerModel.xml