Update of /cvsroot/xine/xine-ui/misc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8392/misc
Modified Files:
xine-check.sh.in
Log Message:
Ignore aliases caused by symlinks (given a working readlink -f).
Quote the plugin dir name (cd $plugindir).
Don't report literal "*.so" when checking for plugins.
Index: xine-check.sh.in
===================================================================
RCS file: /cvsroot/xine/xine-ui/misc/xine-check.sh.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xine-check.sh.in 5 Jun 2006 21:34:26 -0000 1.17
+++ xine-check.sh.in 17 Dec 2006 23:18:48 -0000 1.18
@@ -308,6 +308,17 @@
read answer
}
+resolve_symlinks() {
+ if readlink -f / >/dev/null 2>/dev/null; then
+ while read n; do
+ readlink -f "$n"
+ done
+ else
+ while read n; do
+ echo "$n"
+ done
+ fi
+}
# command line
while [ "$#" -gt 0 ]; do
@@ -463,7 +474,7 @@
xine_executables=""
if search -x bin/xine; then
- xine_executables="$found"
+ xine_executables=`echo "$found"|resolve_symlinks|sort|uniq`
if [ `echo "$xine_executables" | wc -l` -gt 1 ]; then
msg several-xine 1
else
@@ -478,7 +489,7 @@
xine_executable=""
if search -x xine "$PATH"; then
- xine_executable1=`echo "$found"|sort|uniq`
+ xine_executable1=`echo "$found"|resolve_symlinks|sort|uniq`
if [ `echo "$xine_executable1" | wc -l` -gt 1 ]; then
xine_executable=`echo "$xine_executable1" | head -n 1`
msg several-xine-in-path 1
@@ -565,7 +576,7 @@
decoder=
video_out=
audio_out=
- cd $plugindir
+ cd "$plugindir"
for i in *.so; do
case "$i" in
xineplug_inp_*)
@@ -588,6 +599,9 @@
type=audio_out;
pfx=xineplug_ao_out_;
;;
+ \*.so)
+ continue
+ ;;
*)
type=unknown;
pfx="";
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
