Mercurial > trustbridge
diff packaging/trustbridge.nsi @ 1118:fd85a02d771d
(issue54) Implement a privilege drop to execute the program after installation.
This commit is extremly ugly as I accidentally worked in a
working tree that was partially merged with default.
To review the real change please check the commit that will
merge this branch into default.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 16 Sep 2014 19:45:19 +0200 |
| parents | 1c1964c27b39 |
| children | fd2194295218 |
line wrap: on
line diff
--- a/packaging/trustbridge.nsi Tue Sep 16 11:45:32 2014 +0200 +++ b/packaging/trustbridge.nsi Tue Sep 16 19:45:19 2014 +0200 @@ -27,6 +27,8 @@ !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" !define MULTIUSER_INSTALLMODE_INSTDIR "${productname_short}" +!addplugindir "${plugin_dir}" + !include "MultiUser.nsh" !include "MUI2.nsh" !include "FileFunc.nsh" @@ -93,9 +95,9 @@ Computer installliert. $\r$\n$\r$\n\ Klicken Sie auf 'Fertig stellen', um den Installations-Assistenten\ zu schließen." -;!define MUI_FINISHPAGE_RUN $INSTDIR\trustbridge.exe -;!define MUI_FINISHPAGE_RUN_TEXT "Anwendung starten" -;!define MUI_FINISHPAGE_RUN_FUNCTION RunAsUser +!define MUI_FINISHPAGE_RUN $INSTDIR\trustbridge.exe +!define MUI_FINISHPAGE_RUN_TEXT "Anwendung starten" +!define MUI_FINISHPAGE_RUN_FUNCTION RunAsUser !define MUI_FINISHPAGE_LINK "Mehr unter ${info_url}" !define MUI_FINISHPAGE_LINK_LOCATION "${info_url}" @@ -186,7 +188,7 @@ ; the UI elevated as this could be a security ; problem. Function RunAsUser - ExecShell "" "$INSTDIR\trustbridge.exe" + DesktopShellRun::Exec "$INSTDIR\trustbridge.exe" FunctionEnd ;-------------------------------- @@ -258,6 +260,9 @@ !insertmacro MUI_STARTMENU_WRITE_END done: + StrCmp $is_update '1' run_silent dont_run +run_silent: +dont_run: SectionEnd