* toolbox:

    + Disabled useless verbosity.
    + Fixed some incorrect ">/dev/null 2>&1" semantics.

diff --git a/toolbox b/toolbox
index dc75194a78f3fda429558aa68dfc109707ebe34b..e14ba73bc5046a54961621479b9f274a54803c1f 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.26 2003/06/21 17:04:20 sam Exp $
+##  $Id: toolbox,v 1.27 2003/06/25 03:08:57 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -353,7 +353,7 @@ fi
 ##
 if test "${action}" = "includes"
 then
-  set -x
+  #set -x
 
   LIBVLC_HEADERS=`getfiles HEADERS_include`
   BUILTINS=`while test $# -gt 0; do echo $1; shift; done`
@@ -368,7 +368,7 @@ then
   echo '#ifdef __PLUGIN__' >> ${file}.in
   cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/#   define \2 p_symbols->\2_inner/' >> ${file}.in
   echo '#endif /* __PLUGIN__ */' >> ${file}.in
-  if diff 2>&1 >/dev/null ${file} ${file}.in
+  if diff >/dev/null 2>&1 ${file} ${file}.in
   then
     rm -f ${file}.in
   else
@@ -382,7 +382,7 @@ then
   echo '#define STORE_SYMBOLS( p_symbols ) \' >> ${file}.tmp
   cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    (p_symbols)->\2_inner = \2; \\/' >> ${file}.tmp
   echo '' >> ${file}.tmp
-  if diff 2>&1 >/dev/null ${file} ${file}.tmp
+  if diff >/dev/null 2>&1 ${file} ${file}.tmp
   then
     rm -f ${file}.tmp
   else
@@ -412,7 +412,7 @@ then
   fi
   echo "    } while( 0 );" >> ${file}.tmp
   echo "" >> ${file}.tmp
-  if diff 2>&1 >/dev/null ${file} ${file}.tmp
+  if diff >/dev/null 2>&1 ${file} ${file}.tmp
   then
     rm -f ${file}.tmp
   else
@@ -436,7 +436,7 @@ then
   for file in modules/gui/gtk/gnome_interface.c modules/gui/gtk/gtk_interface.c modules/gui/familiar/interface.c
   do
     echo "fixing $file"
-    if grep "DO NOT EDIT THIS FILE" $file 2>&1 > /dev/null
+    if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
     then
       rm -f $file.$$.bak
       cat > $file.$$.bak << EOF
@@ -459,7 +459,7 @@ EOF
   for file in modules/gui/gtk/gtk_support.h modules/gui/familiar/support.h
   do
     echo "fixing $file"
-    if grep "DO NOT EDIT THIS FILE" $file 2>&1 > /dev/null
+    if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
     then
       rm -f $file.$$.bak
       sed -e 's/DO NOT EDIT.*/Created by glade, fixed by bootstrap/' \