Revision: 46334
Author: daniel
Date: 2009-01-27 12:08:07 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
make shell scripts run on solaris, and oblivious of version number
Modified Paths:
--------------
trunk/WikiWord/WikiWord/ww.sh
trunk/WikiWord/WikiWordBuilder/importDump.sh
Modified: trunk/WikiWord/WikiWord/ww.sh
===================================================================
--- trunk/WikiWord/WikiWord/ww.sh 2009-01-27 12:07:28 UTC (rev 46333)
+++ trunk/WikiWord/WikiWord/ww.sh 2009-01-27 12:08:07 UTC (rev 46334)
@@ -48,11 +48,11 @@
cp="$cp"`getconf "$dir/local.classpath" ":"`
if [ -z "$cp" ]; then
- for j in `find "$dir" -path "$dir/lib/*.jar"`; do
+ for j in `find "$dir" -name "*.jar" | grep "^$dir/lib/"`; do
cp="$cp:$j"
done
- for j in `find "$dir/.." -path "$dir/../WikiWord*/lib/*.jar"`; do
+ for j in `find "$dir/.." -name "*.jar" | grep
"^$dir/\.\./WikiWord.*/lib/"`; do
cp="$cp:$j"
done
fi
Modified: trunk/WikiWord/WikiWordBuilder/importDump.sh
===================================================================
--- trunk/WikiWord/WikiWordBuilder/importDump.sh 2009-01-27 12:07:28 UTC
(rev 46333)
+++ trunk/WikiWord/WikiWordBuilder/importDump.sh 2009-01-27 12:08:07 UTC
(rev 46334)
@@ -11,8 +11,8 @@
ww="$dir/ww.sh"
elif [ -f "$dir/../WikiWord/ww.sh" ]; then
ww="$dir/../WikiWord/ww.sh"
-elif [ -f "$dir/../WikiWord-0.1/ww.sh" ]; then
- ww="$dir/../WikiWord-0.1/ww.sh"
+elif [ -f "$dir"/../WikiWord-0.?/ww.sh ]; then
+ ww=`echo "$dir"/../WikiWord-0.?/ww.sh`
else
echo "ww.sh not found!"
exit 5
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs