Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / list.sh

diff --git a/modules/list.sh b/modules/list.sh
index cfa1147051cbb74747b03dafef9075191f73f76e..459b5d977beae89794fb77448085188455e31148 100755 (executable)
--- a/modules/list.sh
+++ b/modules/list.sh
@@ -6,8 +6,6 @@ export LANG
 
 TEMPFILE=/tmp/vlclist.tmp.$$
 LISTFILE=LIST
-LISTFILE2=/tmp/vlclist2.tmp.$$
-LISTFILE3=/tmp/vlclist3.tmp.$$
 
 
 rm -f $TEMPFILE
@@ -21,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
@@ -44,9 +43,9 @@ 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"
@@ -63,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 -u $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