Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Execute the Windows installer as normal user #2628

Merged
merged 4 commits into from
Aug 6, 2024
Merged

Execute the Windows installer as normal user #2628

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dac251d
Execute as user, write HKCU registry entries
mardukbp Jun 23, 2024
7266b7c
Create .livebookdesktop.bat in the USERPROFILE
mardukbp Jul 13, 2024
3159fc9
Update rel/app/windows/Installer.nsi
wojtekmach Aug 6, 2024
3e3e568
Remove rel/app/windows/livebookdesktop.bat
wojtekmach Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions rel/app/windows/Installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Unicode True
InstallDir "$LOCALAPPDATA\Livebook"

; Need admin for registering URL scheme
RequestExecutionLevel admin
RequestExecutionLevel user

!define MUI_ABORTWARNING
!define MUI_ICON "Resources\AppIcon.ico"
Expand All @@ -34,20 +34,23 @@ Section "Install"
ExecWait '"$INSTDIR\vc_redist.x64.exe" /install /quiet /norestart'
Delete "$INSTDIR\vc_redist.x64.exe"

File "livebookdesktop.bat"
Rename "$INSTDIR\livebookdesktop.bat" $PROFILE\.livebookdesktop.bat

wojtekmach marked this conversation as resolved.
Show resolved Hide resolved
File /a /r "bin\Livebook-Release\"

CreateDirectory "$LOCALAPPDATA\Livebook\Logs"
WriteUninstaller "$INSTDIR\LivebookUninstall.exe"

WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "DisplayName" "Livebook"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "DisplayVersion" "${LIVEBOOK_VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "DisplayIcon" "$INSTDIR\Livebook.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "Publisher" "Dashbit"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "UninstallString" '"$INSTDIR\LivebookUninstall.exe"'
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "NoRepair" 1
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "DisplayName" "Livebook"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "DisplayVersion" "${LIVEBOOK_VERSION}"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "DisplayIcon" "$INSTDIR\Livebook.exe"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "Publisher" "Dashbit"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "UninstallString" '"$INSTDIR\LivebookUninstall.exe"'
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "NoModify" 1
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook" "NoRepair" 1

WriteRegStr HKLM "Software\Dashbit\Livebook" "InstallRoot" "$INSTDIR"
WriteRegStr HKCU "Software\Dashbit\Livebook" "InstallRoot" "$INSTDIR"
SectionEnd

Section "Desktop Shortcut"
Expand Down Expand Up @@ -77,29 +80,29 @@ SectionEnd

Section "Install Handlers"
DetailPrint "Registering .livemd File Handler"
DeleteRegKey HKCR ".livemd"
WriteRegStr HKCR ".livemd" "" "Livebook.LiveMarkdown"
DeleteRegKey HKCR "Livebook.LiveMarkdown"
WriteRegStr HKCR "Livebook.LiveMarkdown" "" "LiveMarkdown"
WriteRegStr HKCR "Livebook.LiveMarkdown\DefaultIcon" "" "$INSTDIR\Livebook.exe,1"
WriteRegStr HKCR "Livebook.LiveMarkdown\shell\open\command" "" '"$INSTDIR\Livebook.exe" "open:%1"'
DeleteRegKey HKCU "Software\Classes\.livemd"
WriteRegStr HKCU "Software\Classes\.livemd" "" "Livebook.LiveMarkdown"
DeleteRegKey HKCU "Software\Classes\Livebook.LiveMarkdown"
WriteRegStr HKCU "Software\Classes\Livebook.LiveMarkdown" "" "LiveMarkdown"
WriteRegStr HKCU "Software\Classes\Livebook.LiveMarkdown\DefaultIcon" "" "$INSTDIR\Livebook.exe,1"
WriteRegStr HKCU "Software\Classes\Livebook.LiveMarkdown\shell\open\command" "" '"$INSTDIR\Livebook.exe" "open:%1"'

DetailPrint "Registering livebook URL Handler"
DeleteRegKey HKCR "livebook"
WriteRegStr HKCR "livebook" "" "Livebook URL Protocol"
WriteRegStr HKCR "livebook" "URL Protocol" ""
WriteRegStr HKCR "livebook\shell" "" ""
WriteRegStr HKCR "livebook\shell\open" "" ""
WriteRegStr HKCR "livebook\shell\open\command" "" '"$INSTDIR\Livebook.exe" "open:%1"'
DeleteRegKey HKCU "Software\Classes\livebook"
WriteRegStr HKCU "Software\Classes\livebook" "" "Livebook URL Protocol"
WriteRegStr HKCU "Software\Classes\livebook" "URL Protocol" ""
WriteRegStr HKCU "Software\Classes\livebook\shell" "" ""
WriteRegStr HKCU "Software\Classes\livebook\shell\open" "" ""
WriteRegStr HKCU "Software\Classes\livebook\shell\open\command" "" '"$INSTDIR\Livebook.exe" "open:%1"'
SectionEnd

Section "Uninstall"
DeleteRegKey HKCR ".livemd"
DeleteRegKey HKCR "Livebook.LiveMarkdown"
DeleteRegKey HKCR "livebook"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook"
DeleteRegKey HKLM "Software\Dashbit\Livebook"
DeleteRegKey /ifempty HKLM "Software\Dashbit"
DeleteRegKey HKCU "Software\Classes\.livemd"
DeleteRegKey HKCU "Software\Classes\Livebook.LiveMarkdown"
DeleteRegKey HKCU "Software\Classes\livebook"
DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Livebook"
DeleteRegKey HKCU "Software\Dashbit\Livebook"
DeleteRegKey /ifempty HKCU "Software\Dashbit"

DetailPrint "Terminating Livebook..."
ExecWait "taskkill /f /t /im Livebook.exe"
Expand Down
2 changes: 2 additions & 0 deletions rel/app/windows/livebookdesktop.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set LIVEBOOK_DISTRIBUTION=name
set [email protected]