wait #4023 @2

diff --git a/desktop/assets/flashplayer32_0r0_344_winpep.msi b/desktop/assets/flashplayer32_0r0_344_winpep.msi
new file mode 100644 (file)
index 0000000..f6514a9
Binary files /dev/null and b/desktop/assets/flashplayer32_0r0_344_winpep.msi differ

diff --git a/desktop/assets/mms.cfg b/desktop/assets/mms.cfg
new file mode 100644 (file)
index 0000000..bd4037c
--- /dev/null
+++ b/desktop/assets/mms.cfg
@@ -0,0 +1,6 @@
+EOLUninstallDisable=1\r
+SilentAutoUpdateEnable=0\r
+EnableAllowList=1\r
+AutoUpdateDisable=1\r
+ErrorReportingEnable=1\r
+AllowListUrlPattern=https://workshop.fluidbook.com
\ No newline at end of file

diff --git a/desktop/windows-installer/Fluidbook-Workshop.exe b/desktop/windows-installer/Fluidbook-Workshop.exe
index 3206a4b932cd11a6cd99d3fa42b9eb253d873fb0..d8dd23b5c34c1a73bb83bdb1fa1da7b544738dfb 100644 (file)
Binary files a/desktop/windows-installer/Fluidbook-Workshop.exe and b/desktop/windows-installer/Fluidbook-Workshop.exe differ

diff --git a/desktop/windows-installer/FluidbookWorkshop.nsis b/desktop/windows-installer/FluidbookWorkshop.nsis
index 221ec276a2fda995a6e65c1fa41338136cd7e2c3..bb7b1fb688338224c4cddc3588adf6ee4b316bcf 100644 (file)
--- a/desktop/windows-installer/FluidbookWorkshop.nsis
+++ b/desktop/windows-installer/FluidbookWorkshop.nsis
@@ -40,15 +40,25 @@ Section "" ;No components page, name is not important
     ; Set output path to the installation directory.\r
     SetOutPath $INSTDIR\r
 \r
-    File "H:\Works\cubeExtranet\desktop\assets\install_flash_player_ppapi.exe"\r
+    File "H:\Works\cubeExtranet\desktop\assets\flashplayer32_0r0_344_winpep.msi"\r
     File "H:\Works\cubeExtranet\desktop\assets\uninstall_flash_player.exe"\r
-    ExecWait "$INSTDIR\uninstall_flash_player.exe"\r
-    ExecWait "$INSTDIR\install_flash_player_ppapi.exe"\r
 \r
     ; Put file there\r
     SetOverwrite ifnewer\r
     File /a  /r "H:\Works\cubeExtranet\desktop\windows\workshop\windows-x32\"\r
 \r
+    SetOverwrite on\r
+    ExecWait "$INSTDIR\uninstall_flash_player.exe -uninstall"\r
+    ExecWait "$WINDIR\System32\msiexec.exe /i $\"$INSTDIR\flashplayer32_0r0_344_winpep.msi$\" /qn /norestart"\r
+\r
+    SetOutPath $WINDIR\SysWOW64\Macromed\Flash\r
+    SetOverwrite on\r
+    File "H:\Works\cubeExtranet\desktop\assets\mms.cfg"\r
+\r
+    SetOutPath $WINDIR\System32\Macromed\Flash\r
+    SetOverwrite on\r
+    File "H:\Works\cubeExtranet\desktop\assets\mms.cfg"\r
+\r
     ; Create shortcut\r
     CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\workshop.exe" "" "$INSTDIR\package.nw\icon.ico"\r
     CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\workshop.exe" "" "$INSTDIR\package.nw\icon.ico"\r
@@ -61,8 +71,6 @@ Section "" ;No components page, name is not important
     WriteRegStr HKCU "${REG_UNINSTALL}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""\r
 \r
     WriteUninstaller "$INSTDIR\Uninstall.exe"\r
-\r
-    ExecShell "" "$INSTDIR\workshop.exe"\r
 SectionEnd\r
 \r
 Section "Uninstall"\r