mpbb-cleanup: report correct port name for build dirs

mpbb-cleanup

@@ -106,7 +106,12 @@ cleanup() {
     echo
     for dir in build logs; do
         echo "----> Deleting ${dir}"
-        ports="$(find "${option_prefix}/var/macports/${dir}" -name '.*' -prune -o -depth 2 -type d -print | sed 's,^.*/,,' | sort -fu)"
+        if [ "$dir" = build ]; then
+            ftype=l
+        else
+            ftype=d
+        fi
+        ports="$(find "${option_prefix}/var/macports/${dir}" -name '.*' -prune -o -depth 2 -type $ftype -print | sed 's,^.*/,,' | sort -fu)"
         for port in ${ports}; do
             echo "Deleting ${dir} for ${port}"
             "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/noisy-delete.tcl" "${option_prefix}/var/macports/${dir}"/*/"${port}"

tools/noisy-delete.tcl

@@ -15,4 +15,9 @@ set noisemaker {
 
 thread::create $noisemaker
 
-file delete -force {*}$::argv
+foreach f $::argv {
+    if {[file type $f] eq "link"} {
+        file delete -force [file link $f]
+    }
+    file delete -force $f
+}