ossp-pkg/shtool/sh.mkln 1.14 -> 1.15
--- sh.mkln 2003/02/11 13:00:50 1.14
+++ sh.mkln 2003/05/09 09:50:13 1.15
@@ -30,6 +30,7 @@
. ./sh.common
+# determine source(s) and destination
args=$?
srcs=""
while [ $# -gt 1 ]; do
@@ -94,7 +95,11 @@
# make sure the source is reachable from the destination
if [ $dstisabs = 1 ]; then
if [ $srcisabs = 0 ]; then
- if [ -d $srcdir ]; then
+ if [ ".$srcdir" = . ]; then
+ srcdir="`pwd | sed -e 's;/*$;;'`"
+ srcisabs=1
+ oneisabs=1
+ elif [ -d $srcdir ]; then
srcdir="`cd $srcdir; pwd | sed -e 's;/*$;;'`"
srcisabs=1
oneisabs=1
@@ -131,7 +136,8 @@
pl="$dstdir/"
OIFS="$IFS"; IFS='/'
for pe in $pl; do
- [ ".$pe" = . ] && continue
+ [ ".$pe" = . ] && continue
+ [ ".$pe" = .. ] && continue
srcpre="../$srcpre"
done
IFS="$OIFS"
|
|