diff --git a/ulib/.ulib_version b/ulib/.ulib_version index e85087a..f5c8955 100644 --- a/ulib/.ulib_version +++ b/ulib/.ulib_version @@ -1 +1 @@ -31 +32 diff --git a/ulib/base b/ulib/base index 9b9a120..f2874b5 100644 --- a/ulib/base +++ b/ulib/base @@ -1446,10 +1446,10 @@ function cpnovcs() { [ -d "$destdir" ] || mkdir -p "$destdir" || return 1 if progexists rsync; then local gitexclude=/.git/ - if [ "${src%/}" != "$src" ]; then + if [ "${src%/}" == "$src" ]; then gitexclude="/$(basename -- "$src")$gitexclude" fi - rsync -a ${__CPNOVCS_RSYNC_SLOW:+-c} --exclude CVS --exclude .svn --exclude "$gitexclude" "${__CPNOVCS_RSYNC_ARGS[@]}" "$src" "$destdir/" + rsync -a ${__CPNOVCS_RSYNC_SLOW:+-c} --exclude CVS/ --exclude .svn/ --exclude "$gitexclude" "${__CPNOVCS_RSYNC_ARGS[@]}" "$src" "$destdir/" elif [ "${src%/}" != "$src" ]; then __cpdir "$src" "$destdir" else