Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
46fd3697
Commit
46fd3697
authored
Apr 08, 2019
by
Andreas Traczyk
Browse files
nsis: add icon to installer
Change-Id: I9f39e4f1c2f940637724fc308261677f81e8995c
parent
89b81816
Changes
1
Hide whitespace changes
Inline
Side-by-side
ring.nsi
View file @
46fd3697
...
...
@@ -13,6 +13,7 @@
!include "MUI2.nsh"
!define MUI_ICON "jami.ico"
!define MUI_WELCOMEPAGE
!define MUI_LICENSEPAGE
!define MUI_DIRECTORYPAGE
...
...
@@ -196,17 +197,10 @@ section "install"
WriteRegStr HKCR "ring" "URL Protocol" "$\"$\""
WriteRegStr HKCR "ring\DefaultIcon" "" "$\"$INSTDIR\Jami.exe,1$\""
WriteRegStr HKCR "ring\shell\open\command" "" "$\"$INSTDIR\Jami.exe$\" $\"%1$\""
# vcredist install (this check may not work if the vc_redist is uninstalled by the user as
# uninstallation does not remove the REG key
${If} ${RunningX64}
ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Bld"
StrCmp $1 27012 vcredist_installed
${Else}
ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Bld"
StrCmp $1 27012 vcredist_installed
${EndIf}
# force vc_redist for now
ExecWait "vc_redist.x64.exe /install /norestart"
vcredist
_installed:
delete "
vc
_
redist
.x64.exe"
sectionEnd
# Uninstaller
...
...
@@ -246,6 +240,7 @@ section "uninstall"
rmDir "$SMPROGRAMS\${COMPANYNAME}"
# Remove files
delete $INSTDIR\vc_redist.x64.exe
delete $INSTDIR\Jami.exe
delete $INSTDIR\jami.ico
delete $INSTDIR\*.dll
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment