[vlc-commits] Fix inverted shell negation "! test" -> "test !"

Rémi Denis-Courmont git at videolan.org
Tue Feb 28 19:09:12 CET 2012


vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 28 18:28:09 2012 +0200| [8cbe58b24ae4db95c54470470e036345de934c2d] | committer: Rémi Denis-Courmont

Fix inverted shell negation "! test" -> "test !"

(cherry picked from commit 3e48c330dccfb4d90e0b3d97308038b6de3b570b)

Conflicts:

	configure.ac

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=8cbe58b24ae4db95c54470470e036345de934c2d
---

 configure.ac                                       |    6 +++---
 contrib/src/change_prefix.sh                       |    4 ++--
 modules/genmf                                      |    2 +-
 .../frontrow_plugin/BackRowHeaders/install.sh      |    2 +-
 .../stream_filter/httplive/traffic-shaping.sh      |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0dac4e5..2384f4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,7 +182,7 @@ case "${host_os}" in
       [AS_HELP_STRING([--with-macosx-sdk=DIR],
         [compile using the SDK in DIR])])
     test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.6.sdk
-    ! test -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
+    test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
     CPP="${CPP} -isysroot ${with_macosx_sdk}"
     CC="${CC} -isysroot ${with_macosx_sdk}"
     CXX="${CXX} -isysroot ${with_macosx_sdk}"
@@ -3766,14 +3766,14 @@ then
 
   VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
 
-  if ! test -d ${CONTRIB_DIR}/Sparkle.framework
+  if test ! -d ${CONTRIB_DIR}/Sparkle.framework
   then
     AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
   fi
   VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
   VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
 
-  if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework
+  if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
   then
     AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
   fi
diff --git a/contrib/src/change_prefix.sh b/contrib/src/change_prefix.sh
index d114241..f6a56a0 100755
--- a/contrib/src/change_prefix.sh
+++ b/contrib/src/change_prefix.sh
@@ -48,7 +48,7 @@ process() {
 }
 
 for file in `find . -type f`; do
- if ! test -e $file; then
+ if test ! -e $file; then
    echo "$file doesn't exist"
    continue
  fi
@@ -61,7 +61,7 @@ for file in `find . -type f`; do
     libs=`otool -L $file 2>/dev/null | grep $prefix | cut -d\  -f 1`
     first=y
     for i in "" $libs; do
-      if ! test -z $i; then
+      if test ! -z $i; then
         if test $islib = y -a $first = y; then
             install_name_tool -id `echo $i | sed -e "s,$prefix,$new_prefix,"` $file
             first=n
diff --git a/modules/genmf b/modules/genmf
index aefd560..67fe47c 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -13,7 +13,7 @@ while test "$1"
 do
   dir="$1"
   modf="modules/${dir}/Modules.am"
-  if ! test -f "$modf"; then
+  if test ! -f "$modf"; then
     echo "$modf does not exist!" >&2
     exit 1
   fi
diff --git a/projects/macosx/frontrow_plugin/BackRowHeaders/install.sh b/projects/macosx/frontrow_plugin/BackRowHeaders/install.sh
index 4c49e3e..f77c244 100755
--- a/projects/macosx/frontrow_plugin/BackRowHeaders/install.sh
+++ b/projects/macosx/frontrow_plugin/BackRowHeaders/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if ! test -e $PWD/Headers/BREvent.h; then
+if test ! -e $PWD/Headers/BREvent.h; then
     echo "Please run this script from BackRowHeaders directory"
     exit 1
 else
diff --git a/test/modules/stream_filter/httplive/traffic-shaping.sh b/test/modules/stream_filter/httplive/traffic-shaping.sh
index cf67c89..1b63c91 100755
--- a/test/modules/stream_filter/httplive/traffic-shaping.sh
+++ b/test/modules/stream_filter/httplive/traffic-shaping.sh
@@ -34,7 +34,7 @@ function traffic_shaping() {
 # tc qdisc add dev eth2 root tbf rate 50kbit burst 2kbit latency 70ms peakrate 52kbit mtu 1500
 
 traffic_shaping
-if ! test "${RESULT}" = "0"; then
+if test "${RESULT}" != "0"; then
     exit 1
 fi
 exit 0



More information about the vlc-commits mailing list