X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Flist.sh;h=459b5d977beae89794fb77448085188455e31148;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=0ac02fac90e1dd200fe4a5fc3b3dac1839e68dd5;hpb=e73a02832a00ac93f14cef3ab1d4281f1ca465e2;p=vlc

diff --git a/modules/list.sh b/modules/list.sh
index 0ac02fac90..459b5d977b 100755
--- a/modules/list.sh
+++ b/modules/list.sh
@@ -1,10 +1,11 @@
 #! /bin/sh
 # Piggy list consistency checker
 
-TEMPFILE=/tmp/list.tmp
+LANG=C
+export LANG
+
+TEMPFILE=/tmp/vlclist.tmp.$$
 LISTFILE=LIST
-LISTFILE2=/tmp/list2.tmp
-LISTFILE3=/tmp/list3.tmp
 
 
 rm -f $TEMPFILE
@@ -18,10 +19,11 @@ i=0
 
 for modfile in `find . -name "Modules.am"`
 do
- for module in `grep "SOURCES_" $modfile|awk '{print $1}'|awk 'BEGIN {FS="SOURCES_"};{print $2}'`
+ for module in `awk '/^SOURCES_/{sub(/SOURCES_/,"",$1); print $1}' "$modfile"`\
+               `awk '/^lib.*_plugin_la_SOURCES/{sub(/lib/,""); sub(/_plugin_la_SOURCES/,"",$1); print $1}' "$modfile"`
  do
   echo $module >> $TEMPFILE
-  if [ `grep " \* $module:" $LISTFILE |wc -l` == 0 ]
+  if ! grep -q " \* $module:" $LISTFILE
   then
    echo "$module exists in $modfile, but not listed"
    i=1
@@ -29,7 +31,7 @@ do
  done
 done
 
-if [ $i == 0 ]
+if [ $i = 0 ]
 then
   echo "OK"
 fi
@@ -41,16 +43,16 @@ echo "--------------------------------------"
 echo "Checking that all listed modules exist"
 echo "--------------------------------------"
 
-for module in `grep " \* " $LISTFILE|awk '{print $2}'|sed s,':',,g `
+for module in `awk -F'[ :]' '/ \* /{print $3}' $LISTFILE`
 do
- if [`grep $module $TEMPFILE|wc -l` == 0 ]
+ if ! grep -wq $module $TEMPFILE
  then
   i=1
   echo "$module is listed but does not exist"
  fi
 done
 
-if [ $i == 0 ]
+if [ $i = 0 ]
 then
   echo "OK"
 fi
@@ -60,27 +62,10 @@ echo "-------------------------------"
 echo "Checking for alphabetical order"
 echo "-------------------------------"
 
-rm -f $LISTFILE2
-touch $LISTFILE2
-rm -f $LISTFILE3
-touch $LISTFILE3
-
-grep " \* " $LISTFILE  >> $LISTFILE2
-
-sort -n $LISTFILE2 >> $LISTFILE3
-
-i=`diff $LISTFILE2 $LISTFILE3|wc -l`
-diff $LISTFILE2 $LISTFILE3
-
-if [ $i == 0 ]
-then 
-  echo "OK"
-fi
+grep " \* " $LISTFILE | LC_CTYPE=C sort -c && echo "OK"
 
 
 echo ""
-echo "`cat $TEMPFILE| wc -l` modules listed in Modules.am files"
+echo "`sort -u $TEMPFILE | wc -l` modules listed in Modules.am files"
 
 rm -f $TEMPFILE
-rm -f $LISTFILE2
-rm -f $LISTFILE3