Skip to content

Commit 788c0cc

Browse files
committed
Update 64-bit installer script.
1 parent 93dce9e commit 788c0cc

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

Installer/Create_Installer_w64.nsi

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,6 @@ SectionIn RO
9292
SetOutPath "$INSTDIR"
9393
File "${BINDIR}\emergeCore.exe"
9494
File "${BINDIR}\Explorer.exe"
95-
SetOutPath "$APPDATA\Emerge Desktop\scripts"
96-
IfFileExists "$APPDATA\Emerge Desktop\scripts\hide.pl" +2
97-
File "..\Source\scripts\hide.pl"
98-
IfFileExists "$APPDATA\Emerge Desktop\scripts\Perl_HowTo.txt" +2
99-
File "..\Source\scripts\Perl_HowTo.txt"
100-
IfFileExists "$APPDATA\Emerge Desktop\scripts\hide.pyw" +2
101-
File "..\Source\scripts\hide.pyw"
102-
IfFileExists "$APPDATA\Emerge Desktop\scripts\Python_HowTo.txt" +2
103-
File "..\Source\scripts\Python_HowTo.txt"
104-
IfFileExists "$APPDATA\Emerge Desktop\scripts\hide.rb" +2
105-
File "..\Source\scripts\hide.rb"
10695
Push $R0
10796
${If} ${FIELD1} == ${BST_CHECKED}
10897
System::Call "kernel32::GetCurrentProcess() i .s"
@@ -156,7 +145,7 @@ File "${BINDIR}\emergeCommand.exe"
156145
CreateDirectory "$APPDATA\Emerge Desktop\files"
157146
IfFileExists "$APPDATA\Emerge Desktop\files\cmd.txt" +3
158147
SetOutPath "$APPDATA\Emerge Desktop\files"
159-
File "..\Source\files\cmd.txt"
148+
File /nonfatal "..\Source\files\cmd.txt"
160149
SectionEnd
161150

162151
Section "emergeHotkeys" SecemergeHotkeys
@@ -198,14 +187,15 @@ SubSectionEnd
198187
Section "-Libraries"
199188
SetOutPath "$INSTDIR"
200189
File "${BINDIR}\emergeLib.dll"
201-
File "${BINDIR}\libgcc_s_sjlj-1.dll"
202-
File "${BINDIR}\libstdc++-6.dll"
203190
File "${BINDIR}\emergeIcons.dll"
204191
File "${BINDIR}\emergeGraphics.dll"
205192
File "${BINDIR}\emergeAppletEngine.dll"
206193
File "${BINDIR}\emergeStyleEngine.dll"
207194
File "${BINDIR}\emergeBaseClasses.dll"
195+
File "${BINDIR}\emergeTrayExplorerHook.dll"
208196
Delete "$INSTDIR\emergeSchemeEngine.dll"
197+
SetOutPath "$INSTDIR\Plugins\"
198+
File "${BINDIR}\Plugins\emergeDefaultInternalCommands.dll"
209199
SectionEnd
210200

211201
Section "-Themes"
@@ -305,13 +295,14 @@ Section Uninstall
305295
Delete "$INSTDIR\emergeSysMon.exe"
306296
Delete "$INSTDIR\Explorer.exe"
307297
Delete "$INSTDIR\emergeLib.dll"
308-
Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
309-
Delete "$INSTDIR\libstdc++-6.dll"
310298
Delete "$INSTDIR\emergeIcons.dll"
311299
Delete "$INSTDIR\emergeAppletEngine.dll"
312300
Delete "$INSTDIR\emergeStyleEngine.dll"
313301
Delete "$INSTDIR\emergeGraphics.dll"
314302
Delete "$INSTDIR\emergeBaseClasses.dll"
303+
Delete "$INSTDIR\emergeTrayExplorerHook.dll"
304+
Delete "$INSTDIR\Plugins\emergeDefaultInternalCommands.dll"
305+
RMDir "$INSTDIR\Plugins"
315306
Delete "$INSTDIR\uninst.exe"
316307
RMDir "$INSTDIR"
317308
RMDir "$APPDATA\Emerge Desktop"

0 commit comments

Comments
 (0)