зеркало из https://github.com/nextcloud/desktop.git
Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
This reverts commit 8dd374fc2b
.
https://github.com/owncloud/client/issues/3254
This commit is contained in:
Родитель
330b352001
Коммит
63294f0702
|
@ -97,7 +97,6 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
|
|||
!include WordFunc.nsh ;Used by VersionCompare macro function.
|
||||
!include FileFunc.nsh ;Used to read out parameters
|
||||
!include UAC.nsh ;Used by the UAC elevation to install as user or admin.
|
||||
!include nsProcess.nsh ;Used to kill the running process
|
||||
!include Library.nsh ;Used by the COM registration for shell extensions
|
||||
!include x64.nsh ;Used to determine the right arch for the shell extensions
|
||||
|
||||
|
@ -258,7 +257,7 @@ FunctionEnd
|
|||
##############################################################################
|
||||
|
||||
!macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
|
||||
${nsProcess::FindProcess} ${processName} $R0
|
||||
Processes::FindProcess ${processName}
|
||||
StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
|
||||
!macroend
|
||||
|
||||
|
@ -268,7 +267,7 @@ FunctionEnd
|
|||
/SD IDYES IDYES process_${processName}_kill IDNO process_${processName}_ended
|
||||
process_${processName}_kill:
|
||||
DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT
|
||||
${nsProcess::KillProcess} ${processName} $R0
|
||||
Processes::KillProcess ${processName}
|
||||
Sleep 1500
|
||||
StrCmp $R0 "1" process_${processName}_ended
|
||||
DetailPrint $ConfirmEndProcess_KILL_NOT_FOUND_TEXT
|
||||
|
|
Загрузка…
Ссылка в новой задаче