Use system pgrep instead of pidof
Fix pure-ftpd naming
This commit is contained in:
parent
c1b3d406fe
commit
6b5ff5c552
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=260186
3 changed files with 22 additions and 1 deletions
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= ftpmonitor
|
||||
PORTVERSION= 1.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= ftp kde
|
||||
MASTER_SITES= GOOGLE_CODE
|
||||
PKGNAMEPREFIX= plasma-applet-
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- ./src/ftpmonitorloop.cpp.orig 2010-06-12 10:18:35.000000000 +0400
|
||||
+++ ./src/ftpmonitorloop.cpp 2010-08-30 12:10:58.553618412 +0400
|
||||
@@ -84,7 +84,7 @@
|
||||
bool FTPMonitorLoop::ftpdServerIsRunning(QString ftpdServerName)
|
||||
{
|
||||
QProcess checkFtpd;
|
||||
- checkFtpd.start( "pidof " + ftpdServerName );
|
||||
+ checkFtpd.start( "pgrep " + ftpdServerName );
|
||||
|
||||
if (!checkFtpd.waitForStarted())
|
||||
return true;
|
|
@ -1,5 +1,5 @@
|
|||
--- ./src/ftpserver/pureftpdmonitor.h.orig 2010-06-12 01:33:45.000000000 +0400
|
||||
+++ ./src/ftpserver/pureftpdmonitor.h 2010-06-15 22:44:35.632390428 +0400
|
||||
+++ ./src/ftpserver/pureftpdmonitor.h 2010-08-28 02:58:47.738230460 +0400
|
||||
@@ -50,7 +50,7 @@
|
||||
void createExecCommand(bool useSudo,QString whoPath)
|
||||
{
|
||||
|
@ -9,3 +9,12 @@
|
|||
else
|
||||
mFtpWhoCommand.bin = whoPath + ftpWhoBinaryName();
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
*/
|
||||
QString ftpdServerName()
|
||||
{
|
||||
- return QString("pureftpd");
|
||||
+ return QString("pure-ftpd");
|
||||
}
|
||||
|
||||
QString static ftpWhoBinaryName()
|
||||
|
|
Loading…
Reference in a new issue