[Pkg-owncloud-commits] [owncloud-client] 100/498: Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 63294f07023180ae2409d9c68924873c2ad956dd
Author: Markus Goetz <markus at woboq.com>
Date:   Wed May 20 12:33:17 2015 +0200

    Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
    
    This reverts commit 8dd374fc2b6c23b20169f88f3081657e018d73c3.
    
    https://github.com/owncloud/client/issues/3254
---
 cmake/modules/NSIS.template.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 754363d..8ec3cfb 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git