enhance suggest

bpkg.sh

@@ -19,10 +19,10 @@ commands () {
   {
     declare -a local cmds=( $(
       bpkg-suggest 'bpkg-' |
-      tail -n+2 |
-      xargs basename |
-      sort -u |
-      sed 's/bpkg-//g' |
+      tail -n+2            |
+      xargs basename       |
+      sort -u              |
+      sed 's/bpkg-//g'     |
       tr '\n' ' '
     ) )
 
@@ -82,19 +82,15 @@ bpkg () {
       else
         echo >&2 "error: \`${arg}' is not a bpkg command."
         {
-          declare -a local res=($(
-            bpkg-suggest "${cmd}" |
-            tail -n+2 |
-            xargs basename |
-            sort -u |
-            tr '\n' ' '
-          ))
+          declare -a local res=($(commands))
 
           if [ ! -z "${res}" ]; then
             echo
             echo  >&2 "Did you mean one of these?"
-            for r in ${res}; do
-              echo "     ${r}"
+            for r in ${res[@]}; do
+              if [[ "$r" == *"${arg}"* ]]; then
+                echo "     $ bpkg ${r}"
+              fi
             done
             return 1
           else
@@ -107,6 +103,7 @@ bpkg () {
 
   esac
   usage
+  return 1
 }
 
 ## export or run

lib/install/install.sh

@@ -254,7 +254,9 @@ bpkg_install () {
     ## grab each script and place in deps directory
     for (( i = 0; i < ${#scripts[@]} ; ++i )); do
       (
-        local script=${scripts[$i]}
+        local script="$(echo ${scripts[$i]} | xargs basename )"
+        info "fetch" "${url}/${script}"
+        info "write" "${cwd}/deps/${name}/${script}"
         curl -sL "${url}/${script}" -o "${cwd}/deps/${name}/${script}"
       )
     done