openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File fix-path.diff of Package klamav (Revision 08e9dbc3a5b36f10b4a8c8fd63ce4d33)

Currently displaying revision 08e9dbc3a5b36f10b4a8c8fd63ce4d33 , Show latest

Subject: Fix incorrect path
From: Marc Benstein
Signed-Off-By: Lubos Lunak
Feature: bnc#354018
Patch-upstream: no

--- src/schedule.cpp	2008-06-02 15:59:33.000000000 -0600
+++ src/schedule.cpp	2008-06-02 16:03:16.000000000 -0600
@@ -365,7 +365,7 @@
 		ts << "export HOSTNAME" << "\n";
 		ts << QString("PATH=%1").arg(QString(getenv("PATH"))) << "\n";
 		ts << "export PATH" << "\n";
-		ts << "DCOPSERVER=`cat /home/$USER/.DCOPserver_$HOSTNAME_:0 | grep local`" << "\n";
+		ts << "DCOPSERVER=`cat /home/${USER}/.DCOPserver_${HOSTNAME}_:0 | grep local`" << "\n";
 		ts << "export DCOPSERVER" << "\n";
 		ts << "DISPLAY=:0" << "\n";
 		ts << "export DISPLAY" << "\n";
@@ -384,9 +384,9 @@
 		ts << "  fi" << "\n";
 		ts << "  shift" << "\n";
 		ts << "done" << "\n";
-        ts << "DCOPEXEC=`type dcop`" << "\n";
-        ts << "KLAMAVEXEC=`type klamav`" << "\n";
-        ts << "if $DCOPEXEC `$DCOPEXEC|grep klamav|head -1` DCOPKlamscan scanURLs \"$URL\"; then" << "\n";
+        ts << "DCOPEXEC=`which dcop`" << "\n";
+        ts << "KLAMAVEXEC=`which klamav`" << "\n";
+        ts << "if $DCOPEXEC `$DCOPEXEC|grep klamav|head -1` DCOPKlamscan scanURLs \"${URL}\"; then" << "\n";
 		ts << "        exit 0" << "\n";
 		ts << "else" << "\n";
 		ts << "         $KLAMAVEXEC --scanthis $SCANTHIS" << "\n";

Places

File fix-path.diff of Package klamav (Revision 08e9dbc3a5b36f10b4a8c8fd63ce4d33)

Places