rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge nsis files into one

Browse Source
This commit is contained in:
Florian Bruhin 2017-05-23 18:09:46 +02:00
parent bbd33d24a3
commit 4879b48afe
2 changed files with 76 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
misc/nsis/x86_64.nsi → misc/nsis/qutebrowser.nsi
View File

@ -1,66 +1,76 @@
Name "qutebrowser" Name "qutebrowser"
OutFile "qutebrowser-x86_64.exe"
Unicode true
Unicode true RequestExecutionLevel admin
RequestExecutionLevel admin
!ifdef X64
;Default installation folder OutFile "qutebrowser-x86_64.exe"
InstallDir "$ProgramFiles64\qutebrowser" InstallDir "$ProgramFiles64\qutebrowser"
!else
!include "MUI2.nsh" OutFile "qutebrowser-x86.exe"
;!include "MultiUser.nsh" InstallDir "$ProgramFiles\qutebrowser"
!endif
!define MUI_ABORTWARNING
;!define MULTIUSER_MUI ;Default installation folder
;!define MULTIUSER_INSTALLMODE_COMMANDLINE
!define MUI_ICON "../../icons/qutebrowser.ico" !include "MUI2.nsh"
!define MUI_UNICON "../../icons/qutebrowser.ico" ;!include "MultiUser.nsh"
!insertmacro MUI_PAGE_LICENSE "../../COPYING" !define MUI_ABORTWARNING
!insertmacro MUI_PAGE_DIRECTORY ;!define MULTIUSER_MUI
!insertmacro MUI_PAGE_INSTFILES ;!define MULTIUSER_INSTALLMODE_COMMANDLINE
!insertmacro MUI_UNPAGE_CONFIRM !define MUI_ICON "../../icons/qutebrowser.ico"
!insertmacro MUI_UNPAGE_INSTFILES !define MUI_UNICON "../../icons/qutebrowser.ico"
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_PAGE_LICENSE "../../COPYING"
!insertmacro MUI_PAGE_DIRECTORY
; depends on admin status !insertmacro MUI_PAGE_INSTFILES
;SetShellVarContext current !insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
Section "Install" !insertmacro MUI_LANGUAGE "English"
; Uninstall old versions ; depends on admin status
ExecWait 'MsiExec.exe /quiet /qn /norestart /X{633F41F9-FE9B-42D1-9CC4-718CBD01EE11}' ;SetShellVarContext current
ExecWait 'MsiExec.exe /quiet /qn /norestart /X{9331D947-AC86-4542-A755-A833429C6E69}'
SetOutPath "$INSTDIR" Section "Install"
file /r "qutebrowser-x86_64\*.*" ; Uninstall old versions
ExecWait 'MsiExec.exe /quiet /qn /norestart /X{633F41F9-FE9B-42D1-9CC4-718CBD01EE11}'
SetShellVarContext all ExecWait 'MsiExec.exe /quiet /qn /norestart /X{9331D947-AC86-4542-A755-A833429C6E69}'
CreateShortCut "$SMPROGRAMS\qutebrowser.lnk" "$INSTDIR\qutebrowser.exe"
SetOutPath "$INSTDIR"
;Create uninstaller
WriteUninstaller "$INSTDIR\uninst.exe" !ifdef X64
file /r "qutebrowser-x86_64\*.*"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "DisplayName" "qutebrowser" !else
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "UninstallString" '"$INSTDIR\uninst.exe"' file /r "qutebrowser-x86\*.*"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "QuietUninstallString" '"$INSTDIR\uninst.exe" /S' !endif
SectionEnd SetShellVarContext all
CreateShortCut "$SMPROGRAMS\qutebrowser.lnk" "$INSTDIR\qutebrowser.exe"
;--------------------------------
;Uninstaller Section ;Create uninstaller
WriteUninstaller "$INSTDIR\uninst.exe"
Section "Uninstall"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "DisplayName" "qutebrowser"
SetShellVarContext all WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "UninstallString" '"$INSTDIR\uninst.exe"'
Delete "$SMPROGRAMS\qutebrowser.lnk" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "QuietUninstallString" '"$INSTDIR\uninst.exe" /S'
RMDir /r "$INSTDIR\*.*" SectionEnd
RMDir "$INSTDIR"
;--------------------------------
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" ;Uninstaller Section
SectionEnd Section "Uninstall"
SetShellVarContext all
Delete "$SMPROGRAMS\qutebrowser.lnk"
RMDir /r "$INSTDIR\*.*"
RMDir "$INSTDIR"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser"
SectionEnd

66
misc/nsis/x86.nsi
View File

@ -1,66 +0,0 @@
Name "qutebrowser"
OutFile "qutebrowser-x86.exe"
Unicode true
RequestExecutionLevel admin
;Default installation folder
InstallDir "$ProgramFiles\qutebrowser"
!include "MUI2.nsh"
;!include "MultiUser.nsh"
!define MUI_ABORTWARNING
;!define MULTIUSER_MUI
;!define MULTIUSER_INSTALLMODE_COMMANDLINE
!define MUI_ICON "../../icons/qutebrowser.ico"
!define MUI_UNICON "../../icons/qutebrowser.ico"
!insertmacro MUI_PAGE_LICENSE "../../COPYING"
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_LANGUAGE "English"
; depends on admin status
;SetShellVarContext current
Section "Install"
; Uninstall old versions
ExecWait 'MsiExec.exe /quiet /qn /norestart /X{633F41F9-FE9B-42D1-9CC4-718CBD01EE11}'
ExecWait 'MsiExec.exe /quiet /qn /norestart /X{9331D947-AC86-4542-A755-A833429C6E69}'
SetOutPath "$INSTDIR"
file /r "qutebrowser-x86\*.*"
SetShellVarContext all
CreateShortCut "$SMPROGRAMS\qutebrowser.lnk" "$INSTDIR\qutebrowser.exe"
;Create uninstaller
WriteUninstaller "$INSTDIR\uninst.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "DisplayName" "qutebrowser"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "UninstallString" '"$INSTDIR\uninst.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser" "QuietUninstallString" '"$INSTDIR\uninst.exe" /S'
SectionEnd
;--------------------------------
;Uninstaller Section
Section "Uninstall"
SetShellVarContext all
Delete "$SMPROGRAMS\qutebrowser.lnk"
RMDir /r "$INSTDIR\*.*"
RMDir "$INSTDIR"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qutebrowser"
SectionEnd