diff options
| -rw-r--r-- | net/cvsup-mirror/pkg-install | 12 | ||||
| -rw-r--r-- | net/cvsup-mirror/scripts/configure | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/net/cvsup-mirror/pkg-install b/net/cvsup-mirror/pkg-install index ef180f4b5d61..53f97b7f98d6 100644 --- a/net/cvsup-mirror/pkg-install +++ b/net/cvsup-mirror/pkg-install @@ -50,11 +50,19 @@ install_links() { path=${dir}/${subdir} fi ( cd ${prefixes} || exit - test -d ${path} || mkdir -p ${path} || exit ) + if [ "x${subdir}" != "x." -a -h ${path} ]; then + cat <<EOF +"${subdir}" must be a true subdirectory of "${dir}", not a symbolic link. +Please remove the symbolic link and/or configure again using the true +directory path to "${subdir}". +EOF + exit 1 + fi + test -d ${path} || mkdir -p ${path} || exit ) || exit if ! expr "${chmods_done}" : ".* ${path} " >/dev/null 2>&1; then echo -n " Making the ${path} tree world-readable ..." ( chdir ${prefixes} || exit - chmod -R a+rX ${path} || exit ) + chmod -R a+rX ${path} || exit ) || exit echo " done." chmods_done="${chmods_done}${path} " fi diff --git a/net/cvsup-mirror/scripts/configure b/net/cvsup-mirror/scripts/configure index 6854f90ad8f0..58928c8a92ea 100644 --- a/net/cvsup-mirror/scripts/configure +++ b/net/cvsup-mirror/scripts/configure @@ -40,6 +40,12 @@ ask_distrib() { subdir=$3 desc=$4 if yesno "Do you wish to mirror the ${desc}" y; then + if [ "${subdir}" != "." ]; then + cat <<EOF +Note: the location for this must match "*/${subdir}", and +"${subdir}" must be a true subdirectory, not a symbolic link. +EOF + fi while :; do dir=$(ask "Where would you like to put it" ${dflt}) if [ "${subdir}" = "." ]; then @@ -124,7 +130,7 @@ EOF distribs="distrib.self .. ." ask_distrib FreeBSD.cvs /home/ncvs . \ - "main source tree, except crypto code (340 MB)" + "main source tree, except crypto code (350 MB)" ask_distrib FreeBSD-crypto.cvs /home/ncvs . \ "crypto code (7 MB)" ask_distrib FreeBSD.lite2 /home/lite2 . \ |