modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

permettre d'overrider -q

This commit is contained in:
Jephté Clain 2014-03-27 15:20:01 +04:00
parent 84b93bd4b8
commit 4dc6988608
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ulib/.ulib_version
View File

@ -1 +1 @@
29
30

10
ulib/base
View File

@ -1364,7 +1364,7 @@ function rm_maybe() {
done
[ -n "$rm" ] && /bin/rm "$@"
}
__CPDIR_RSYNC_ARGS=()
__CPDIR_RSYNC_ARGS=(-q)
function cpdir() {
# copier un fichier dans un répertoire, ou le contenu d'un répertoire dans un
# autre répertoire, que le répertoire source soit un lien symbolique ou
@ -1378,9 +1378,9 @@ function cpdir() {
if progexists rsync; then
[ -d "$2" ] || mkdir -p "$2" || return 1
if [ -d "$1" ]; then
rsync -qa "${__CPDIR_RSYNC_ARGS[@]}" "$1/" "$2/"
rsync -a "${__CPDIR_RSYNC_ARGS[@]}" "$1/" "$2/"
else
rsync -qa "${__CPDIR_RSYNC_ARGS[@]}" "$1" "$2/"
rsync -a "${__CPDIR_RSYNC_ARGS[@]}" "$1" "$2/"
fi
else
__cpdir "$@"
@ -1430,7 +1430,7 @@ function __cpdir() {
fi
}
CPNOVCS_OPTS=() # deprecated
__CPNOVCS_RSYNC_ARGS=()
__CPNOVCS_RSYNC_ARGS=(-q)
function cpnovcs() {
# copier le fichier/répertoire $1 *dans* le *répertoire* $2 avec rsync. Les
# options du tableau __CPNOVCS_RSYNC_ARGS sont rajoutées aux options standard
@ -1448,7 +1448,7 @@ function cpnovcs() {
if [ "${src%/}" != "$src" ]; then
gitexclude="/$(basename -- "$src")$gitexclude"
fi
rsync -qa --exclude CVS --exclude .svn --exclude "$gitexclude" "${CPNOVCS_OPTS[@]}" "${__CPNOVCS_RSYNC_ARGS[@]}" "$src" "$destdir/"
rsync -a --exclude CVS --exclude .svn --exclude "$gitexclude" "${CPNOVCS_OPTS[@]}" "${__CPNOVCS_RSYNC_ARGS[@]}" "$src" "$destdir/"
elif [ "${src%/}" != "$src" ]; then
__cpdir "$src" "$destdir"
else