Changeset 43ac528d8f637d7397e17f5468ec195bb36a0c01
- Timestamp:
- 06/25/03 05:08:57
(5 years ago)
- Author:
- Sam Hocevar <sam@videolan.org>
- git-committer:
- Sam Hocevar <sam@videolan.org> 1056510537 +0000
- git-parent:
[9269acf9a71fd1f220cb974a5877dde50a600d55]
- git-author:
- Sam Hocevar <sam@videolan.org> 1056510537 +0000
- Message:
- toolbox:
+ Disabled useless verbosity.
+ Fixed some incorrect ">/dev/null 2>&1" semantics.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r9542cc8 |
r43ac528 |
|
| 2 | 2 | |
|---|
| 3 | 3 | ## toolbox for the VLC media player |
|---|
| 4 | | ## $Id: toolbox,v 1.26 2003/06/21 17:04:20 sam Exp $ |
|---|
| | 4 | ## $Id: toolbox,v 1.27 2003/06/25 03:08:57 sam Exp $ |
|---|
| 5 | 5 | ## |
|---|
| 6 | 6 | ## Authors: Samuel Hocevar <sam@zoy.org> |
|---|
| … | … | |
| 355 | 355 | if test "${action}" = "includes" |
|---|
| 356 | 356 | then |
|---|
| 357 | | set -x |
|---|
| | 357 | #set -x |
|---|
| 358 | 358 | |
|---|
| 359 | 359 | LIBVLC_HEADERS=`getfiles HEADERS_include` |
|---|
| … | … | |
| 370 | 370 | cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' >> ${file}.in |
|---|
| 371 | 371 | echo '#endif /* __PLUGIN__ */' >> ${file}.in |
|---|
| 372 | | if diff 2>&1 >/dev/null ${file} ${file}.in |
|---|
| | 372 | if diff >/dev/null 2>&1 ${file} ${file}.in |
|---|
| 373 | 373 | then |
|---|
| 374 | 374 | rm -f ${file}.in |
|---|
| … | … | |
| 384 | 384 | cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> ${file}.tmp |
|---|
| 385 | 385 | echo '' >> ${file}.tmp |
|---|
| 386 | | if diff 2>&1 >/dev/null ${file} ${file}.tmp |
|---|
| | 386 | if diff >/dev/null 2>&1 ${file} ${file}.tmp |
|---|
| 387 | 387 | then |
|---|
| 388 | 388 | rm -f ${file}.tmp |
|---|
| … | … | |
| 414 | 414 | echo " } while( 0 );" >> ${file}.tmp |
|---|
| 415 | 415 | echo "" >> ${file}.tmp |
|---|
| 416 | | if diff 2>&1 >/dev/null ${file} ${file}.tmp |
|---|
| | 416 | if diff >/dev/null 2>&1 ${file} ${file}.tmp |
|---|
| 417 | 417 | then |
|---|
| 418 | 418 | rm -f ${file}.tmp |
|---|
| … | … | |
| 438 | 438 | do |
|---|
| 439 | 439 | echo "fixing $file" |
|---|
| 440 | | if grep "DO NOT EDIT THIS FILE" $file 2>&1 > /dev/null |
|---|
| | 440 | if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 |
|---|
| 441 | 441 | then |
|---|
| 442 | 442 | rm -f $file.$$.bak |
|---|
| … | … | |
| 461 | 461 | do |
|---|
| 462 | 462 | echo "fixing $file" |
|---|
| 463 | | if grep "DO NOT EDIT THIS FILE" $file 2>&1 > /dev/null |
|---|
| | 463 | if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 |
|---|
| 464 | 464 | then |
|---|
| 465 | 465 | rm -f $file.$$.bak |
|---|