summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-07-05 12:56:47 -0700
committerjimw@mysql.com <>2005-07-05 12:56:47 -0700
commitc45f86a2653c2695a275d7fc73efd77ff662a834 (patch)
tree5a5a281b47fe42ac043b0499807af49ba87eb7b3 /scripts
parent9f654b806a4519722b2322e7566f0edc7e8e1b1f (diff)
parent13773acc1b534ab2edb6701f0c54184ae45d82f3 (diff)
downloadmariadb-git-c45f86a2653c2695a275d7fc73efd77ff662a834.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-10986
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_config.sh18
1 files changed, 13 insertions, 5 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index a5c8af5ecb2..16e50c044ca 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -60,11 +60,19 @@ fix_path ()
get_full_path ()
{
- case $1 in
- /*) echo "$1";;
- ./*) tmp=`pwd`/$1; echo $tmp | sed -e 's;/\./;/;' ;;
- *) which $1 ;;
- esac
+ file=$1
+
+ # if the file is a symlink, try to resolve it
+ if [ -h $file ];
+ then
+ file=`ls -l $file | awk '{ print $NF }'`
+ fi
+
+ case $file in
+ /*) echo "$file";;
+ */*) tmp=`pwd`/$file; echo $tmp | sed -e 's;/\./;/;' ;;
+ *) which $file ;;
+ esac
}
me=`get_full_path $0`