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

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

Revision: 256
          http://assorted.svn.sourceforge.net/assorted/?rev=256&view=rev
Author:   yangzhang
Date:     2008-01-19 22:37:00 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
added nounset

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

Modified: shell-tools/trunk/src/bash-commons/common.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/common.bash	2008-01-20 06:36:17 UTC (rev 255)
+++ shell-tools/trunk/src/bash-commons/common.bash	2008-01-20 06:37:00 UTC (rev 256)
@@ -4,11 +4,12 @@
 # TODO reorganize the functions here
 # TODO clean up the logging functions
 
-if [[ "$1" != '-n' ]] ; then
+if [[ "${1:-}" != '-n' ]] ; then
     set -o errexit
+    set -o nounset
 fi
 
-if [[ $xtrace ]] ; then
+if [[ "${xtrace:-}" ]] ; then
     set -o xtrace
 fi
 

Modified: shell-tools/trunk/src/daemon-ctl.bash
===================================================================
--- shell-tools/trunk/src/daemon-ctl.bash	2008-01-20 06:36:17 UTC (rev 255)
+++ shell-tools/trunk/src/daemon-ctl.bash	2008-01-20 06:37:00 UTC (rev 256)
@@ -6,7 +6,7 @@
 . common.bash
 
 usage="
-$command [OPTIONS] COMMAND [OPTIONS]
+$cmd_name [OPTIONS] COMMAND [OPTIONS]
 Options: TODO WRITE OPTIONS
 "
 
@@ -62,7 +62,7 @@
 		"$@" > "$stderr" &
 	elif [[ "$stdout" == "$stderr" ]] ; then
 		mkdir -p "$( dirname "$stdout" )"
-		$save_exit "$@" >& "$stdout" &
+		${save_exit:-} "$@" >& "$stdout" &
 	else
 		mkdir -p "$( dirname "$stdout" )"
 		mkdir -p "$( dirname "$stderr" )"
@@ -86,7 +86,6 @@
 	{
 		# TODO not using mktemp; this is to run on OE
 		pid_pipe="${TMP:-/tmp}/$$.pipe"
-		echo "$pid_pipe"
 		mkfifo "$pid_pipe"
 		exit-monitor "$@" >& /dev/null &
 		pid="$( < "$pid_pipe" )"

Modified: shell-tools/trunk/src/trash.bash
===================================================================
--- shell-tools/trunk/src/trash.bash	2008-01-20 06:36:17 UTC (rev 255)
+++ shell-tools/trunk/src/trash.bash	2008-01-20 06:37:00 UTC (rev 256)
@@ -5,11 +5,7 @@
 
 . common.bash
 
-if [[ ! "$TRASHDIR" ]] ; then
-    TRASHDIR="$HOME/trash"
-fi
-
+: "${TRASHDIR:="$HOME/trash"}"
 dir="$TRASHDIR/$(date)"
-
 mkdir -p "$dir"
 mv "$@" "$dir"


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