Browse Source

fix 'shtool mkln' command

master
parent
commit
b75f54765e
  1. 2
      openpkg/openpkg.spec
  2. 16
      openpkg/shtool

2
openpkg/openpkg.spec

@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
%define V_openpkg 20030429
%define V_openpkg 20030509
# the used software versions
%define V_rpm 4.0.2

16
openpkg/shtool

@ -6,7 +6,7 @@
## See http://www.gnu.org/software/shtool/ for more information.
## See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
##
## Version: 2.0b0 (29-Apr-2003)
## Version: 2.0b0 (09-May-2003)
## Contents: all available modules
##
@ -65,7 +65,7 @@ if [ $# -eq 0 ]; then
exit 1
fi
if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
echo "This is GNU shtool, version 2.0b0 (29-Apr-2003)"
echo "This is GNU shtool, version 2.0b0 (09-May-2003)"
echo "Copyright (c) 1994-2003 Ralf S. Engelschall <rse@engelschall.com>"
echo "Report bugs to <bug-shtool@gnu.org>"
echo ''
@ -128,7 +128,7 @@ if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
exit 0
fi
if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
echo "GNU shtool 2.0b0 (29-Apr-2003)"
echo "GNU shtool 2.0b0 (09-May-2003)"
exit 0
fi
if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
@ -1462,6 +1462,7 @@ mkln )
## Originally written for shtool
##
# determine source(s) and destination
args=$?
srcs=""
while [ $# -gt 1 ]; do
@ -1526,7 +1527,11 @@ mkln )
# 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
@ -1563,7 +1568,8 @@ mkln )
pl="$dstdir/"
OIFS="$IFS"; IFS='/'
for pe in $pl; do
[ ".$pe" = . ] && continue
[ ".$pe" = . ] && continue
[ ".$pe" = .. ] && continue
srcpre="../$srcpre"
done
IFS="$OIFS"

Loading…
Cancel
Save