ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/install-sh
(Generate patch)

Comparing ircd-hybrid-8/install-sh (file contents):
Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
Revision 1257 by michael, Sun Jan 15 06:28:46 2012 UTC

# Line 1 | Line 1
1   #!/bin/sh
2   # install - install a program, script, or datafile
3  
4 < scriptversion=2010-02-06.18; # UTC
4 > scriptversion=2011-01-19.21; # UTC
5  
6   # This originates from X11R5 (mit/util/scripts/install.sh), which was
7   # later released in X11R6 (xc/config/util/install.sh) with the
# Line 156 | Line 156 | while test $# -ne 0; do
156      -s) stripcmd=$stripprog;;
157  
158      -t) dst_arg=$2
159 +        # Protect names problematic for `test' and other utilities.
160 +        case $dst_arg in
161 +          -* | [=\(\)!]) dst_arg=./$dst_arg;;
162 +        esac
163          shift;;
164  
165      -T) no_target_directory=true;;
# Line 186 | Line 190 | if test $# -ne 0 && test -z "$dir_arg$ds
190      fi
191      shift # arg
192      dst_arg=$arg
193 +    # Protect names problematic for `test' and other utilities.
194 +    case $dst_arg in
195 +      -* | [=\(\)!]) dst_arg=./$dst_arg;;
196 +    esac
197    done
198   fi
199  
# Line 232 | Line 240 | fi
240  
241   for src
242   do
243 <  # Protect names starting with `-'.
243 >  # Protect names problematic for `test' and other utilities.
244    case $src in
245 <    -*) src=./$src;;
245 >    -* | [=\(\)!]) src=./$src;;
246    esac
247  
248    if test -n "$dir_arg"; then
# Line 256 | Line 264 | do
264        echo "$0: no destination specified." >&2
265        exit 1
266      fi
259
267      dst=$dst_arg
261    # Protect names starting with `-'.
262    case $dst in
263      -*) dst=./$dst;;
264    esac
268  
269      # If destination is a directory, append the input filename; won't work
270      # if double slashes aren't ignored.
# Line 389 | Line 392 | do
392  
393        case $dstdir in
394          /*) prefix='/';;
395 <        -*) prefix='./';;
395 >        [-=\(\)!]*) prefix='./';;
396          *)  prefix='';;
397        esac
398  
# Line 407 | Line 410 | do
410  
411        for d
412        do
413 <        test -z "$d" && continue
413 >        test X"$d" = X && continue
414  
415          prefix=$prefix$d
416          if test -d "$prefix"; then

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)