[PC-BSD Commits] r21256 - pcbsd/current/src-sh/pc-updatemanager

[svn at pcbsd.org]

Author: kris
Date: 2013-01-30 20:31:54 +0000 (Wed, 30 Jan 2013)
New Revision: 21256

Modified:
   pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
Log:

Make pc-updatemanager work with the pkgng EVENT_PIPE



Modified: pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2013-01-30 19:21:55 UTC (rev 21255)
+++ pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2013-01-30 20:31:54 UTC (rev 21256)
@@ -441,9 +441,16 @@
   # Running from a GUI?
   if [ -n "$PCFETCHGUI" ] ; then
     # Setup EVENT_PIPE
-    EVENT_PIPE="/tmp/.pkg.$$.pipe"
-    mkfifo $EVENT_PIPE
+    EVENT_PIPE="/tmp/pkgpipe.$$"
+    export EVENT_PIPE
+    rc_halt "mkfifo $EVENT_PIPE"
     echo "EVENT_PIPE: $EVENT_PIPE"
+
+    # Wait for QT to open the pipe file
+    sleep 5
+
+    # Tickle pkg update first
+    pkg update
   fi
 
   # Start the package update!
@@ -456,6 +463,7 @@
   # Cleanup EVENT_PIPE
   if [ -n "$PCFETCHGUI" ] ; then
     rm $EVENT_PIPE
+    killall -9 $PID
   fi
 
   if [ $result -ne 0 ] ; then