Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
082a2589
Commit
082a2589
authored
Feb 05, 2019
by
Andreas Traczyk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packaging: detect vc_redist and prevent reinstallation
Change-Id: I149d58da06d6ab2ae8ea712da9a39374ac921cf1
parent
f764efa3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
ring.nsi
ring.nsi
+10
-9
No files found.
ring.nsi
View file @
082a2589
...
...
@@ -196,15 +196,16 @@ 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 (the check would work if uninstalling would 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}
ExecWait "vc_redist.x64.exe /install /passive /norestart"
# 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}
ExecWait "vc_redist.x64.exe /install /norestart"
#vcredist_installed:
sectionEnd
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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