From 4deb90ec40bd9ddfeaed9344be5b0100105abf72 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 May 2015 22:23:52 +0200 Subject: [PATCH] =?UTF-8?q?Next=20round=20in=20manual=20Win32=20installer?= =?UTF-8?q?=20merge,=20this=20time=209f4b1de05f4b=20(Add=20option=20to=20r?= =?UTF-8?q?emove=20user=20settings=20and=20cache=20files=20at=20uninstall,?= =?UTF-8?q?=20with=20message=E2=80=A6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../installers/windows/installer_template.nsi | 18 ++---------------- indra/newview/installers/windows/lang_da.nsi | Bin 8782 -> 8812 bytes indra/newview/installers/windows/lang_de.nsi | Bin 10646 -> 10350 bytes .../newview/installers/windows/lang_en-us.nsi | Bin 9374 -> 9090 bytes indra/newview/installers/windows/lang_es.nsi | Bin 9456 -> 9480 bytes indra/newview/installers/windows/lang_fr.nsi | Bin 9730 -> 9760 bytes indra/newview/installers/windows/lang_it.nsi | Bin 9092 -> 9122 bytes indra/newview/installers/windows/lang_ja.nsi | Bin 8206 -> 8234 bytes indra/newview/installers/windows/lang_pl.nsi | Bin 9696 -> 9360 bytes .../newview/installers/windows/lang_pt-br.nsi | Bin 9712 -> 9742 bytes indra/newview/installers/windows/lang_ru.nsi | Bin 9052 -> 9082 bytes indra/newview/installers/windows/lang_tr.nsi | Bin 9112 -> 9142 bytes indra/newview/installers/windows/lang_zh.nsi | Bin 7798 -> 7826 bytes 13 files changed, 2 insertions(+), 16 deletions(-) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 306869e927..0be1c1bb64 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -435,7 +435,7 @@ Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" Call un.ProgramFiles # Clean up cache and log files, but leave them in-place for non AGNI installs. -Call un.DocumentsAndSettingsFolder +Call un.UserSettingsFiles SectionEnd @@ -759,7 +759,7 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Delete files in \Users\\AppData\ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -Function un.DocumentsAndSettingsFolder +Function un.UserSettingsFiles # Ask if user wants to keep data files or not MessageBox MB_YESNO|MB_ICONQUESTION $(RemoveDataFilesMB) IDYES Remove IDNO Keep @@ -817,20 +817,6 @@ Keep: FunctionEnd -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Delete the stored password for the current Windows user -;; DEV-10821 -- Unauthorised user can gain access to an SL account after a real user has uninstalled -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;Function un.RemovePassword -; -;DetailPrint "Removing Second Life password" -; -;SetShellVarContext current -;Delete "$APPDATA\SecondLife\user_settings\password.dat" -S;etShellVarContext all -; -;FunctionEnd - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Delete the installed files ;; This deletes the uninstall executable, but it works because it is copied to temp directory before running diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi index 0ef932569ba430a6702c496246e9e4d4c973d56a..87cbb7878d8c190c73675c4ed7b0118eaa81c474 100755 GIT binary patch delta 86 zcmX@-^2TLDl$3EILoq`(g91YdLq3o!Vn}7k1+vP3v;spZP%afHrVgYP7*ZG#fvOT2 d6ej0O>9e~)c#~VD4JY4_@?x~#tSGI^4giQN6h8m} delta 66 zcmaFka?WK#l$2-@Ln=cqLq0o5&mk%|#Wb%0>(aDFnR3<-=KePFW$|`06TZt#LE12pp_n0?L4l!!AsR_ delta 161 zcmZp2pXa&3L3;8Vb{^qmhD3&Bh75*OhBSsuh8!SWJn^BVd=QY4%aG4d2Be+gO59*d zCL2mC*Nn&o~$9eh|zxYd09nv05`c7z5oCK delta 76 zcmeD1`rx@?g^XwsLn=cqLq0Sx{G8uA!YKkX6 V6xE*WCcA)Dj{yibKbKWx2LLTv6h#04 diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi index fe7279cfafe1e7def18fdfad1301cdb6a4da9cc0..3a377ff6c062df3b57df7e7caaaef035663e561b 100755 GIT binary patch delta 88 zcmZqjS>Ur_hpb^DLoq`(g91YdLq3o!Vn}7k1+vP3v;spZP%afHrVgYP7*ZG#fvOTG ezm-#+{6Ut7-37|mmN%SiCO3)Ee)DlTYjyy~;ua+U delta 60 zcmZ4B)8w;ZhwS7t96X%K42cZM3>gfmlX>NpC-cei2s*<=7~B{#8FGL!vdWs1gXAV{ JekNzd4gds45K906 diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi index 9e48b0ac60cfb3aa17e871cca0fbfd29b114241d..96da714f6cadc3a333dd43e5f588a2e3e6375e90 100755 GIT binary patch delta 88 zcmZp1U*x{QLE12pp_n0?L4l!!Ast0~E^u diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi index 17a78c463c6ec18084583de1f2ee438338008cfc..2b357689188c9f9cf75fe9b3d8482ed96b45406f 100755 GIT binary patch delta 89 zcmeBkSmm%`i-ch!Loq`(g91YdLq3o!Vn}7k1+vP3v;spZP%afHrVgYP7*ZG#fvOTG f@0L`Z{6>O@-37}3DQP;{OfrT^{{QAFl2vQ~-?SG| delta 73 zcmZ4G(C4sWi-c$qLn=cqLq0b^WHRIc)f7*z T=hB`WBpJiRWUzUIWEC3#=2jD7 diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi index d52c2478dd3c9b2683a25b6f3309d0f8732636d7..c3d4106a49e753109f081533bb3b3101890205eb 100755 GIT binary patch delta 73 zcmaFhJ;8Is4Qcg6hGK?n1_g!^hI}Ad#E{C63uKi6X$6K-pj;|YOr4>4vZA8+`M`U_4e7}d96X%K42cZM3>gfmleuLKg`HtM1~-OGh8%`ehT_Q^dDJHhu&_uM zGvqUr1LgC8GN}v-3OonWR&kW_0m&#ZQmjlJpfNF9WQh@SB3{^lg-^=K4R*+?3 znXIFrz#Rk>&IKwc14{gt78g|jD$E2Lm;)3`2Wn1aC}B{T%qSo{nTbnkvVqL6$!uI= OlM7^dHoGZ$F#`bY>MOVa diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi index 9d4a7bd2b92b451bfff7d1c016a25addd4653610..d3711c36564b628b65c77478c97bae760780082f 100755 GIT binary patch delta 88 zcmez1-RHBRNY*fsp_n0?L4l!!AsmLk2_Y^z*w42cZM3>gfmlXb-ng`HtM1~-OGh8%`ehT_SMJcg4Oh