Commit 482ebff
Lars Hecking
Update from automake cvs.
1 parent beeae91 commit 482ebff
3 files changed
Lines changed: 93 additions & 83 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -109,7 +109,7 @@ then | |||
| 109 | 109 | echo "install: no input file specified" | |
| 110 | 110 | exit 1 | |
| 111 | 111 | else | |
| 112 | - true | ||
| 112 | + : | ||
| 113 | 113 | fi | |
| 114 | 114 | ||
| 115 | 115 | if [ x"$dir_arg" != x ]; then | |
@@ -120,17 +120,17 @@ if [ x"$dir_arg" != x ]; then | |||
| 120 | 120 | instcmd=: | |
| 121 | 121 | chmodcmd="" | |
| 122 | 122 | else | |
| 123 | - instcmd=mkdir | ||
| 123 | + instcmd=$mkdirprog | ||
| 124 | 124 | fi | |
| 125 | 125 | else | |
| 126 | 126 | ||
| 127 | 127 | # Waiting for this to be detected by the "$instcmd $src $dsttmp" command | |
| 128 | 128 | # might cause directories to be created, which would be especially bad | |
| 129 | 129 | # if $src (and thus $dsttmp) contains '*'. | |
| 130 | 130 | ||
| 131 | - if [ -f $src -o -d $src ] | ||
| 131 | + if [ -f "$src" ] || [ -d "$src" ] | ||
| 132 | 132 | then | |
| 133 | - true | ||
| 133 | + : | ||
| 134 | 134 | else | |
| 135 | 135 | echo "install: $src does not exist" | |
| 136 | 136 | exit 1 | |
@@ -141,7 +141,7 @@ else | |||
| 141 | 141 | echo "install: no destination specified" | |
| 142 | 142 | exit 1 | |
| 143 | 143 | else | |
| 144 | - true | ||
| 144 | + : | ||
| 145 | 145 | fi | |
| 146 | 146 | ||
| 147 | 147 | # If destination is a directory, append the input filename; if your system | |
@@ -151,7 +151,7 @@ else | |||
| 151 | 151 | then | |
| 152 | 152 | dst="$dst"/`basename $src` | |
| 153 | 153 | else | |
| 154 | - true | ||
| 154 | + : | ||
| 155 | 155 | fi | |
| 156 | 156 | fi | |
| 157 | 157 | ||
@@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` | |||
| 163 | 163 | ||
| 164 | 164 | # Skip lots of stat calls in the usual case. | |
| 165 | 165 | if [ ! -d "$dstdir" ]; then | |
| 166 | - defaultIFS=' | ||
| 167 | - ' | ||
| 166 | + defaultIFS=' | ||
| 167 | + ' | ||
| 168 | 168 | IFS="${IFS-${defaultIFS}}" | |
| 169 | 169 | ||
| 170 | 170 | oIFS="${IFS}" | |
@@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do | |||
| 183 | 183 | then | |
| 184 | 184 | $mkdirprog "${pathcomp}" | |
| 185 | 185 | else | |
| 186 | - true | ||
| 186 | + : | ||
| 187 | 187 | fi | |
| 188 | 188 | ||
| 189 | 189 | pathcomp="${pathcomp}/" | |
@@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ] | |||
| 194 | 194 | then | |
| 195 | 195 | $doit $instcmd $dst && | |
| 196 | 196 | ||
| 197 | - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && | ||
| 198 | - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && | ||
| 199 | - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && | ||
| 200 | - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi | ||
| 197 | + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && | ||
| 198 | + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && | ||
| 199 | + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && | ||
| 200 | + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi | ||
| 201 | 201 | else | |
| 202 | 202 | ||
| 203 | 203 | # If we're going to rename the final executable, determine the name now. | |
@@ -216,7 +216,7 @@ else | |||
| 216 | 216 | then | |
| 217 | 217 | dstfile=`basename $dst` | |
| 218 | 218 | else | |
| 219 | - true | ||
| 219 | + : | ||
| 220 | 220 | fi | |
| 221 | 221 | ||
| 222 | 222 | # Make a temp file name in the proper directory. | |
@@ -235,10 +235,10 @@ else | |||
| 235 | 235 | # ignore errors from any of these, just make sure not to ignore | |
| 236 | 236 | # errors from the above "$doit $instcmd $src $dsttmp" command. | |
| 237 | 237 | ||
| 238 | - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && | ||
| 239 | - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && | ||
| 240 | - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && | ||
| 241 | - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && | ||
| 238 | + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && | ||
| 239 | + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && | ||
| 240 | + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && | ||
| 241 | + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && | ||
| 242 | 242 | ||
| 243 | 243 | # Now rename the file to the real destination. | |
| 244 | 244 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,6 @@ | |||
| 1 | 1 | #! /bin/sh | |
| 2 | 2 | # Common stub for a few missing GNU programs while installing. | |
| 3 | - # Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. | ||
| 3 | + # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. | ||
| 4 | 4 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | |
| 5 | 5 | ||
| 6 | 6 | # This program is free software; you can redistribute it and/or modify | |
@@ -293,23 +293,23 @@ WARNING: \`$1' is missing on your system. You should only need it if | |||
| 293 | 293 | # Look for gnutar/gtar before invocation to avoid ugly error | |
| 294 | 294 | # messages. | |
| 295 | 295 | if (gnutar --version > /dev/null 2>&1); then | |
| 296 | - gnutar ${1+"$@"} && exit 0 | ||
| 296 | + gnutar "$@" && exit 0 | ||
| 297 | 297 | fi | |
| 298 | 298 | if (gtar --version > /dev/null 2>&1); then | |
| 299 | - gtar ${1+"$@"} && exit 0 | ||
| 299 | + gtar "$@" && exit 0 | ||
| 300 | 300 | fi | |
| 301 | 301 | firstarg="$1" | |
| 302 | 302 | if shift; then | |
| 303 | 303 | case "$firstarg" in | |
| 304 | 304 | *o*) | |
| 305 | 305 | firstarg=`echo "$firstarg" | sed s/o//` | |
| 306 | - tar "$firstarg" ${1+"$@"} && exit 0 | ||
| 306 | + tar "$firstarg" "$@" && exit 0 | ||
| 307 | 307 | ;; | |
| 308 | 308 | esac | |
| 309 | 309 | case "$firstarg" in | |
| 310 | 310 | *h*) | |
| 311 | 311 | firstarg=`echo "$firstarg" | sed s/h//` | |
| 312 | - tar "$firstarg" ${1+"$@"} && exit 0 | ||
| 312 | + tar "$firstarg" "$@" && exit 0 | ||
| 313 | 313 | ;; | |
| 314 | 314 | esac | |
| 315 | 315 | fi | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,8 +4,6 @@ | |||
| 4 | 4 | # Created: 1993-05-16 | |
| 5 | 5 | # Public domain | |
| 6 | 6 | ||
| 7 | - # $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ | ||
| 8 | - | ||
| 9 | 7 | errstatus=0 | |
| 10 | 8 | dirmode="" | |
| 11 | 9 | ||
@@ -14,18 +12,29 @@ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." | |||
| 14 | 12 | ||
| 15 | 13 | # process command line arguments | |
| 16 | 14 | while test $# -gt 0 ; do | |
| 17 | - case "${1}" in | ||
| 18 | - -h | --help | --h* ) # -h for help | ||
| 19 | - echo "${usage}" 1>&2; exit 0 ;; | ||
| 20 | - -m ) # -m PERM arg | ||
| 21 | - shift | ||
| 22 | - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } | ||
| 23 | - dirmode="${1}" | ||
| 24 | - shift ;; | ||
| 25 | - -- ) shift; break ;; # stop option processing | ||
| 26 | - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option | ||
| 27 | - * ) break ;; # first non-opt arg | ||
| 28 | - esac | ||
| 15 | + case $1 in | ||
| 16 | + -h | --help | --h*) # -h for help | ||
| 17 | + echo "$usage" 1>&2 | ||
| 18 | + exit 0 | ||
| 19 | + ;; | ||
| 20 | + -m) # -m PERM arg | ||
| 21 | + shift | ||
| 22 | + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } | ||
| 23 | + dirmode=$1 | ||
| 24 | + shift | ||
| 25 | + ;; | ||
| 26 | + --) # stop option processing | ||
| 27 | + shift | ||
| 28 | + break | ||
| 29 | + ;; | ||
| 30 | + -*) # unknown option | ||
| 31 | + echo "$usage" 1>&2 | ||
| 32 | + exit 1 | ||
| 33 | + ;; | ||
| 34 | + *) # first non-opt arg | ||
| 35 | + break | ||
| 36 | + ;; | ||
| 37 | + esac | ||
| 29 | 38 | done | |
| 30 | 39 | ||
| 31 | 40 | for file | |
@@ -38,64 +47,65 @@ do | |||
| 38 | 47 | done | |
| 39 | 48 | ||
| 40 | 49 | case $# in | |
| 41 | - 0) exit 0 ;; | ||
| 50 | + 0) exit 0 ;; | ||
| 42 | 51 | esac | |
| 43 | 52 | ||
| 44 | 53 | case $dirmode in | |
| 45 | - '') | ||
| 46 | - if mkdir -p -- . 2>/dev/null; then | ||
| 47 | - echo "mkdir -p -- $*" | ||
| 48 | - exec mkdir -p -- "$@" | ||
| 49 | - fi ;; | ||
| 50 | - *) | ||
| 51 | - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then | ||
| 52 | - echo "mkdir -m $dirmode -p -- $*" | ||
| 53 | - exec mkdir -m "$dirmode" -p -- "$@" | ||
| 54 | - fi ;; | ||
| 54 | + '') | ||
| 55 | + if mkdir -p -- . 2>/dev/null; then | ||
| 56 | + echo "mkdir -p -- $*" | ||
| 57 | + exec mkdir -p -- "$@" | ||
| 58 | + fi | ||
| 59 | + ;; | ||
| 60 | + *) | ||
| 61 | + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then | ||
| 62 | + echo "mkdir -m $dirmode -p -- $*" | ||
| 63 | + exec mkdir -m "$dirmode" -p -- "$@" | ||
| 64 | + fi | ||
| 65 | + ;; | ||
| 55 | 66 | esac | |
| 56 | 67 | ||
| 57 | 68 | for file | |
| 58 | 69 | do | |
| 59 | - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` | ||
| 60 | - shift | ||
| 61 | - | ||
| 62 | - pathcomp= | ||
| 63 | - for d | ||
| 64 | - do | ||
| 65 | - pathcomp="$pathcomp$d" | ||
| 66 | - case "$pathcomp" in | ||
| 67 | - -* ) pathcomp=./$pathcomp ;; | ||
| 68 | - esac | ||
| 69 | - | ||
| 70 | - if test ! -d "$pathcomp"; then | ||
| 71 | - echo "mkdir $pathcomp" | ||
| 72 | - | ||
| 73 | - mkdir "$pathcomp" || lasterr=$? | ||
| 74 | - | ||
| 75 | - if test ! -d "$pathcomp"; then | ||
| 76 | - errstatus=$lasterr | ||
| 77 | - else | ||
| 78 | - if test ! -z "$dirmode"; then | ||
| 79 | - echo "chmod $dirmode $pathcomp" | ||
| 80 | - | ||
| 81 | - lasterr="" | ||
| 82 | - chmod "$dirmode" "$pathcomp" || lasterr=$? | ||
| 83 | - | ||
| 84 | - if test ! -z "$lasterr"; then | ||
| 85 | - errstatus=$lasterr | ||
| 86 | - fi | ||
| 87 | - fi | ||
| 88 | - fi | ||
| 89 | - fi | ||
| 90 | - | ||
| 91 | - pathcomp="$pathcomp/" | ||
| 92 | - done | ||
| 70 | + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` | ||
| 71 | + shift | ||
| 72 | + | ||
| 73 | + pathcomp= | ||
| 74 | + for d | ||
| 75 | + do | ||
| 76 | + pathcomp="$pathcomp$d" | ||
| 77 | + case $pathcomp in | ||
| 78 | + -*) pathcomp=./$pathcomp ;; | ||
| 79 | + esac | ||
| 80 | + | ||
| 81 | + if test ! -d "$pathcomp"; then | ||
| 82 | + echo "mkdir $pathcomp" | ||
| 83 | + | ||
| 84 | + mkdir "$pathcomp" || lasterr=$? | ||
| 85 | + | ||
| 86 | + if test ! -d "$pathcomp"; then | ||
| 87 | + errstatus=$lasterr | ||
| 88 | + else | ||
| 89 | + if test ! -z "$dirmode"; then | ||
| 90 | + echo "chmod $dirmode $pathcomp" | ||
| 91 | + lasterr="" | ||
| 92 | + chmod "$dirmode" "$pathcomp" || lasterr=$? | ||
| 93 | + | ||
| 94 | + if test ! -z "$lasterr"; then | ||
| 95 | + errstatus=$lasterr | ||
| 96 | + fi | ||
| 97 | + fi | ||
| 98 | + fi | ||
| 99 | + fi | ||
| 100 | + | ||
| 101 | + pathcomp="$pathcomp/" | ||
| 102 | + done | ||
| 93 | 103 | done | |
| 94 | 104 | ||
| 95 | 105 | exit $errstatus | |
| 96 | 106 | ||
| 97 | 107 | # Local Variables: | |
| 98 | 108 | # mode: shell-script | |
| 99 | - # sh-indentation: 3 | ||
| 109 | + # sh-indentation: 2 | ||
| 100 | 110 | # End: | |
| 101 | 111 | # mkinstalldirs ends here | |
0 commit comments