Skip to content

Commit dc89398

Browse files
nsis installer interpretation issue fix
1 parent db3f624 commit dc89398

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

.github/workflows/build.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -478,10 +478,10 @@ jobs:
478478
!define APP_EXE \"{exe_name}\"
479479
480480
; Installer attributes
481-
Name \"\${{APP_NAME}}\"
481+
Name \"${{APP_NAME}}\"
482482
OutFile \"dist\\\\{installer_name}\"
483-
InstallDir \"\$PROGRAMFILES64\\\\\${{APP_NAME}}\"
484-
InstallDirRegKey HKLM \"Software\\\\\${{APP_NAME}}\" \"Install_Dir\"
483+
InstallDir \"$PROGRAMFILES64\\\\${{APP_NAME}}\"
484+
InstallDirRegKey HKLM \"Software\\\\${{APP_NAME}}\" \"Install_Dir\"
485485
RequestExecutionLevel admin
486486
487487
; Modern UI
@@ -493,8 +493,8 @@ jobs:
493493
!define MUI_ICON \"logo.ico\"
494494
!define MUI_UNICON \"logo.ico\"
495495
!else
496-
!define MUI_ICON \"\${{NSISDIR}}\\\\Contrib\\\\Graphics\\\\Icons\\\\modern-install.ico\"
497-
!define MUI_UNICON \"\${{NSISDIR}}\\\\Contrib\\\\Graphics\\\\Icons\\\\modern-uninstall.ico\"
496+
!define MUI_ICON \"${{NSISDIR}}\\\\Contrib\\\\Graphics\\\\Icons\\\\modern-install.ico\"
497+
!define MUI_UNICON \"${{NSISDIR}}\\\\Contrib\\\\Graphics\\\\Icons\\\\modern-uninstall.ico\"
498498
!endif
499499
500500
; Pages
@@ -515,7 +515,7 @@ jobs:
515515
516516
; Installer sections
517517
Section \"Install\"
518-
SetOutPath \$INSTDIR
518+
SetOutPath $INSTDIR
519519
File \"dist\\\\{exe_name}\"
520520
521521
; Install Visual C++ Redistributable for Windows 7 compatibility
@@ -524,43 +524,43 @@ jobs:
524524
{'Delete "$INSTDIR\\\\vcredist_x64.exe"' if '${{ matrix.build-type }}' == 'win7-compatible' else ''}
525525
526526
; Create start menu shortcut
527-
CreateDirectory \"\$SMPROGRAMS\\\\\${{APP_NAME}}\"
528-
CreateShortcut \"\$SMPROGRAMS\\\\\${{APP_NAME}}\\\\\${{APP_NAME}}.lnk\" \"\$INSTDIR\\\\\${{APP_EXE}}\"
529-
CreateShortcut \"\$SMPROGRAMS\\\\\${{APP_NAME}}\\\\Uninstall.lnk\" \"\$INSTDIR\\\\uninstall.exe\"
527+
CreateDirectory \"$SMPROGRAMS\\\\${{APP_NAME}}\"
528+
CreateShortcut \"$SMPROGRAMS\\\\${{APP_NAME}}\\\\${{APP_NAME}}.lnk\" \"$INSTDIR\\\\${{APP_EXE}}\"
529+
CreateShortcut \"$SMPROGRAMS\\\\${{APP_NAME}}\\\\Uninstall.lnk\" \"$INSTDIR\\\\uninstall.exe\"
530530
531531
; Create desktop shortcut
532-
CreateShortcut \"\$DESKTOP\\\\\${{APP_NAME}}.lnk\" \"\$INSTDIR\\\\\${{APP_EXE}}\"
532+
CreateShortcut \"$DESKTOP\\\\${{APP_NAME}}.lnk\" \"$INSTDIR\\\\${{APP_EXE}}\"
533533
534534
; Write registry keys
535-
WriteRegStr HKLM \"Software\\\\\${{APP_NAME}}\" \"Install_Dir\" \"\$INSTDIR\"
536-
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"DisplayName\" \"\${{APP_NAME}}\"
537-
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"UninstallString\" '\"\$INSTDIR\\\\uninstall.exe\"'
538-
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"DisplayVersion\" \"\${{APP_VERSION}}\"
539-
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"Publisher\" \"\${{APP_PUBLISHER}}\"
540-
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"URLInfoAbout\" \"\${{APP_URL}}\"
541-
WriteRegDWORD HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"NoModify\" 1
542-
WriteRegDWORD HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\" \"NoRepair\" 1
535+
WriteRegStr HKLM \"Software\\\\${{APP_NAME}}\" \"Install_Dir\" \"$INSTDIR\"
536+
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"DisplayName\" \"${{APP_NAME}}\"
537+
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"UninstallString\" '\"$INSTDIR\\\\uninstall.exe\"'
538+
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"DisplayVersion\" \"${{APP_VERSION}}\"
539+
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"Publisher\" \"${{APP_PUBLISHER}}\"
540+
WriteRegStr HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"URLInfoAbout\" \"${{APP_URL}}\"
541+
WriteRegDWORD HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"NoModify\" 1
542+
WriteRegDWORD HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\" \"NoRepair\" 1
543543
544544
; Create uninstaller
545-
WriteUninstaller \"\$INSTDIR\\\\uninstall.exe\"
545+
WriteUninstaller \"$INSTDIR\\\\uninstall.exe\"
546546
SectionEnd
547547
548548
; Uninstaller section
549549
Section \"Uninstall\"
550550
; Remove files
551-
Delete \"\$INSTDIR\\\\\${{APP_EXE}}\"
552-
Delete \"\$INSTDIR\\\\uninstall.exe\"
553-
RMDir \"\$INSTDIR\"
551+
Delete \"$INSTDIR\\\\${{APP_EXE}}\"
552+
Delete \"$INSTDIR\\\\uninstall.exe\"
553+
RMDir \"$INSTDIR\"
554554
555555
; Remove shortcuts
556-
Delete \"\$SMPROGRAMS\\\\\${{APP_NAME}}\\\\\${{APP_NAME}}.lnk\"
557-
Delete \"\$SMPROGRAMS\\\\\${{APP_NAME}}\\\\Uninstall.lnk\"
558-
RMDir \"\$SMPROGRAMS\\\\\${{APP_NAME}}\"
559-
Delete \"\$DESKTOP\\\\\${{APP_NAME}}.lnk\"
556+
Delete \"$SMPROGRAMS\\\\${{APP_NAME}}\\\\${{APP_NAME}}.lnk\"
557+
Delete \"$SMPROGRAMS\\\\${{APP_NAME}}\\\\Uninstall.lnk\"
558+
RMDir \"$SMPROGRAMS\\\\${{APP_NAME}}\"
559+
Delete \"$DESKTOP\\\\${{APP_NAME}}.lnk\"
560560
561561
; Remove registry keys
562-
DeleteRegKey HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\\${{APP_NAME}}\"
563-
DeleteRegKey HKLM \"Software\\\\\${{APP_NAME}}\"
562+
DeleteRegKey HKLM \"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\${{APP_NAME}}\"
563+
DeleteRegKey HKLM \"Software\\\\${{APP_NAME}}\"
564564
SectionEnd
565565
'''
566566

0 commit comments

Comments
 (0)