[Assorted-commits] SF.net SVN: assorted: [224] shell-tools/trunk/src

[<yan...@us...>]

Revision: 224
          http://assorted.svn.sourceforge.net/assorted/?rev=224&view=rev
Author:   yangzhang
Date:     2008-01-10 20:21:45 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
added setdiff

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/common.bash
    shell-tools/trunk/src/daemon-ctl.bash

Modified: shell-tools/trunk/src/bash-commons/common.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/common.bash	2008-01-11 03:59:19 UTC (rev 223)
+++ shell-tools/trunk/src/bash-commons/common.bash	2008-01-11 04:21:45 UTC (rev 224)
@@ -310,6 +310,17 @@
     grep -B5 'ANSWER: 0'
 }
 
+setdiff() {
+    local a="$( mktemp )" b="$( mktemp )" diff="${3:-diff}" &&
+    sort -u "$1" > "$a" && {
+        sort -u "$2" > "$b" && {
+            "$diff" "$a" "$b" 
+        }
+        rm "$b"
+    }
+    rm "$a"
+}
+
 persist-fsc() {
   local output="$(fsc "$@")" ||
   status="$$"

Modified: shell-tools/trunk/src/daemon-ctl.bash
===================================================================
--- shell-tools/trunk/src/daemon-ctl.bash	2008-01-11 03:59:19 UTC (rev 223)
+++ shell-tools/trunk/src/daemon-ctl.bash	2008-01-11 04:21:45 UTC (rev 224)
@@ -98,7 +98,6 @@
 	{
 		pid=$( cat "$pid_file" )
 		log "stopping pid = $pid, pid file = $pid_file"
-		indent
 		for i in $( seq 1 "$timeout" ) ; do
 			if ! ps $pid > /dev/null ; then
 				break
@@ -109,7 +108,6 @@
 			kill $pid &> /dev/null || true
 			sleep 1
 		done
-		deindent
 		if ps $pid > /dev/null ; then
 			log "Force-killing $pid"
 			kill -9 $pid


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.