[Lunar-commits] r22115 - lunar/branches/stable/var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2006-11-08 16:49:27 +0100 (Wed, 08 Nov 2006)
New Revision: 22115

Modified:
   lunar/branches/stable/var/lib/lunar/functions/messages.lunar
   lunar/branches/stable/var/lib/lunar/functions/tracking.lunar
Log:
[MERGE] merge from theedge: alias bugfixes, performance improvements.


Modified: lunar/branches/stable/var/lib/lunar/functions/messages.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/messages.lunar	2006-11-08 14:33:57 UTC (rev 22114)
+++ lunar/branches/stable/var/lib/lunar/functions/messages.lunar	2006-11-08 15:49:27 UTC (rev 22115)
@@ -37,42 +37,42 @@
 
 # normal messages go to stdout
 message() {
-  if [ -z "$SILENT" ] ; then
+  if [[ -z "$SILENT" ]] ; then
     echo -e "$*"
   fi
 }
 
 
 verbose_msg() {
-  if [ "$VERBOSE" == "on" ] ; then
-    message "+ $*"
+  if [[ "$VERBOSE" == "on" ]] ; then
+    message "+ $*" >&2
   fi
 }
 
 
 debug_msg() {
   local PLUSSES
-  if [ -n "$LUNAR_DEBUG" ] ; then
-    if [ "$LUNAR_DEBUG" -ge "2" ] ; then
-	  PLUSSES="+++++++++++++++++++++++++*"
-	  echo -n "${PLUSSES:0:${#FUNCNAME[@]}} " >&2
-	fi
-    if [ "$LUNAR_DEBUG" -ge "4" ] ; then
+  if [[ -n "$LUNAR_DEBUG" ]] ; then
+    if [[ "$LUNAR_DEBUG" -ge "2" ]] ; then
+          PLUSSES="+++++++++++++++++++++++++*"
+          echo -n "${PLUSSES:0:${#FUNCNAME[@]}} " >&2
+        fi
+    if [[ "$LUNAR_DEBUG" -ge "4" ]] ; then
       echo -n "$(basename $0)[$$]: " >&2
-	fi
-	if [ "$LUNAR_DEBUG" -ge "3" ] ; then
+        fi
+        if [[ "$LUNAR_DEBUG" -ge "3" ]] ; then
       echo -n "$(basename ${BASH_SOURCE[1]}):${BASH_LINENO[1]}: " >&2
-	fi
-    if [ "$LUNAR_DEBUG" -ge "2" ] ; then
-	  if [ "${FUNCNAME[1]}" != "$1" ]; then
-	    echo "$@" >&2
-	  else
+        fi
+    if [[ "$LUNAR_DEBUG" -ge "2" ]] ; then
+          if [[ "${FUNCNAME[1]}" != "$1" ]]; then
+            echo "$@" >&2
+          else
         echo "${FUNCNAME[1]} ($@)" >&2
-	  fi
+          fi
     else
       echo "++ $@" >&2
     fi
-    if [ "$LUNAR_DEBUG" -ge "5" ] ; then
+    if [[ "$LUNAR_DEBUG" -ge "5" ]] ; then
       echo "++ $@" >> $TMPDIR/lp_debuglog.$$
       if [ -f $TMPDIR/l_debug_var.$$ ] ; then
         mv $TMPDIR/l_debug_var.$$ $TMPDIR/l_debug_var.$$.old

Modified: lunar/branches/stable/var/lib/lunar/functions/tracking.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/tracking.lunar	2006-11-08 14:33:57 UTC (rev 22114)
+++ lunar/branches/stable/var/lib/lunar/functions/tracking.lunar	2006-11-08 15:49:27 UTC (rev 22115)
@@ -98,7 +98,7 @@
   rm -f $MD5SUM_LOGS/$MODULE-$VERSION &> /dev/null
   message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$MD5SUM_LOGS/$MODULE-$VERSION${DEFAULT_COLOR}"
 
-  files < $INSTALL_LOGS/$MODULE-$VERSION | xargs md5sum >> $MD5SUM_LOGS/$MODULE-$VERSION
+  IFS=$'\n' files < $INSTALL_LOGS/$MODULE-$VERSION | xargs -i md5sum '{}' >> $MD5SUM_LOGS/$MODULE-$VERSION
 }
 
 create_install_cache() {