merge maintenance branch

FossilOrigin-Name: 1de039467a1cf2facde24b23f24fcefb6bc6eb9f2dfdfff0165416542d2b2724

2 files changed, 9 insertions, 3 deletions

diff --git a/contrib/cpt-fork b/contrib/cpt-fork
index 21e1618..733c942 100755
--- a/contrib/cpt-fork
+++ b/contrib/cpt-fork
@@ -31,12 +31,12 @@ for pkg; do
     case "$pkg" in
         */*)
             [ -d "$pkg" ] || die "$pkg is not a directory"
-            cp -r "$pkg" .
+            cp -Hr "$pkg" .
             pkg=${pkg##*/}
             ;;
         *)
             cpt-search "$pkg" >/dev/null
-            cp -r "$(cpt-search --single "$pkg")" .
+            cp -Hr "$(cpt-search --single "$pkg")" .
     esac
 
     # Sometimes forked packages are from the database and not from a repository.
diff --git a/contrib/cpt-size b/contrib/cpt-size
index 4b983a1..00508b8 100755
--- a/contrib/cpt-size
+++ b/contrib/cpt-size
@@ -10,7 +10,10 @@
 ## calculates the sizes of given
 ## .Ar packages
 ## using the files from the package manifest and outputs a total size of the
-## packages along with all the files associated with them.
+## packages along with all the files associated with them. If no arguments have
+## been given,
+## .Nm
+## will use the name of the current directory as an argument.
 parser_definition() {
     setup REST help:usage -- "usage: ${0##*/} [pkg...]"
     disp :usage -h --help hidden:1
@@ -20,6 +23,9 @@ parser_definition() {
 # shellcheck disable=1091
 . cpt-lib
 
+# Use the current directory if no arguments have been given.
+[ "$1" ] || set -- "${PWD##*/}"
+
 # Ensure that all the packages given as arguments are installed.
 pkg_list "$@" >/dev/null