#BUGFIX by exept
authorClaus Gittinger <cg@exept.de>
Wed, 21 Aug 2019 16:55:47 +0200
changeset 24570 50b4a3f875b9
parent 24569 cef5eed70303
child 24571 3212bdd81ab6
#BUGFIX by exept class: ApplicationDefinition class changed: #osxDmgImageSetupLines
ApplicationDefinition.st
--- a/ApplicationDefinition.st	Wed Aug 21 00:11:40 2019 +0200
+++ b/ApplicationDefinition.st	Wed Aug 21 16:55:47 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -3009,12 +3007,12 @@
         s tab; nextPutLine:('@-rm "%1/"*WinRC.rc' bindWith:macOSDir).
         self additionalFilesToInstall_unix do:[:eachPair | genLine value:s value:'MacOS' value:eachPair].
         self additionalFilesToInstall_osx do:[:eachPair | genLine value:s value:'MacOS' value:eachPair].
-        "/ s tab; nextPutLine:('@-rm -f "%1/"*/*.sav "%1/"*/*/*.sav "%1/"*/*/*/*.sav' bindWith:macOSDir).
-        "/ s tab; nextPutLine:('@-rm -f "%1/"*/*.bak "%1/"*/*/*.bak "%1/"*/*/*/*.bak' bindWith:macOSDir).
         s tab; nextPutLine:('@-find "%1/" -name "*.bak" -exec rm {} \;' bindWith:contentsDir).
         s tab; nextPutLine:('@-find "%1/" -name "*.sav" -exec rm {} \;' bindWith:contentsDir).
-        s tab; nextPutLine:('@-find "%1/" -name "CSV" -exec rm -rf {} \;' bindWith:contentsDir).
+        s tab; nextPutLine:('@-find "%1/" -name "CVS" -exec rm -rf {} \;' bindWith:contentsDir).
         s tab; nextPutLine:('@-find "%1/" -name ".cvsignore" -exec rm {} \;' bindWith:contentsDir).
+        s tab; nextPutLine:('@-rm -rf "%1/.resources" \;' bindWith:resourcesDir).
+        s tab; nextPutLine:('@-find "%1/" -type d -empty -exec rmdir {} \;' bindWith:resourcesDir).
     ].
 
     "Modified: / 24-02-2017 / 16:37:22 / cg"
@@ -3392,7 +3390,7 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 
-LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
+LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
 LangString appOpen ${LANG_ENGLISH} "Open with %(PRODUCT_NAME)"
 
 LangString DESC_Section1 ${LANG_ENGLISH} "Program components of %(PRODUCT_NAME)"
@@ -3426,7 +3424,7 @@
 
 Function un.onInit
 !!insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
   Abort
 FunctionEnd