Install(1): Allow -c option with -d
Contributed by Gautam Tirumala
This commit is contained in:
parent
12e9303297
commit
4b30979086
2 changed files with 10 additions and 4 deletions
|
@ -428,7 +428,7 @@ void usage(void)
|
||||||
Usage:\n\
|
Usage:\n\
|
||||||
install [-lcpsz#] [-o owner] [-g group] [-m mode] [-S stack] [file1] file2\n\
|
install [-lcpsz#] [-o owner] [-g group] [-m mode] [-S stack] [file1] file2\n\
|
||||||
install [-lcpsz#] [-o owner] [-g group] [-m mode] [-S stack] file ... dir\n\
|
install [-lcpsz#] [-o owner] [-g group] [-m mode] [-S stack] file ... dir\n\
|
||||||
install -d [-o owner] [-g group] [-m mode] directory\n");
|
install [-c] -d [-o owner] [-g group] [-m mode] directory\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -600,7 +600,7 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Some options don't mix. */
|
/* Some options don't mix. */
|
||||||
if (dflag && (cflag || lflag || strip)) usage();
|
if (dflag && (lflag || strip)) usage();
|
||||||
|
|
||||||
/* Don't let the user umask interfere. */
|
/* Don't let the user umask interfere. */
|
||||||
umask(000);
|
umask(000);
|
||||||
|
|
|
@ -33,7 +33,9 @@ install \- install files
|
||||||
.IR file " ... " dir
|
.IR file " ... " dir
|
||||||
.br
|
.br
|
||||||
.ti -5
|
.ti -5
|
||||||
.B install \-d
|
.B install
|
||||||
|
.RB [ \-c ]
|
||||||
|
.B \-d
|
||||||
.RB [ \-o
|
.RB [ \-o
|
||||||
.IR owner ]
|
.IR owner ]
|
||||||
.RB [ \-g
|
.RB [ \-g
|
||||||
|
@ -89,7 +91,11 @@ Copy the source file to its proper place. This option is the default if
|
||||||
.B \-l
|
.B \-l
|
||||||
is not given. With
|
is not given. With
|
||||||
.BR \-l ,
|
.BR \-l ,
|
||||||
the file is copied if the link fails.
|
the file is copied if the link fails. This option is also allowed with
|
||||||
|
.BR \-d .
|
||||||
|
In this case the
|
||||||
|
.BR \-c
|
||||||
|
is ignored.
|
||||||
.TP
|
.TP
|
||||||
.B \-p
|
.B \-p
|
||||||
Preserve timestamp on source file or directory.
|
Preserve timestamp on source file or directory.
|
||||||
|
|
Loading…
Reference in a new issue