fix ssh issue, various minor improvements

[distro-setup] / brc2

diff --git a/brc2 b/brc2
index 7f6011f43dd05b4cf61d19d7658449a3a5c4053d..1add8230a8766562b053460b415ce2915afd5018 100644 (file)
--- a/brc2
+++ b/brc2
@@ -412,7 +412,7 @@ iki() {
     *)
       url=$(readlink -f "$input")
       url="https://brains.fsf.org/wiki/${url#*brains/}"
-      url="${url%.mdwn}"
+      url="${url%.mdwn}/"
       j echo "$url"
       ;;
   esac
@@ -1123,6 +1123,8 @@ beet2nav() {
 
 # pull in beets library locally
 beetpull() {
+  local sshfs_host
+  sshfs_host=b8.nz
   if [[ $HOSTNAME == kd ]]; then
     return 0
   fi
@@ -1131,7 +1133,7 @@ beetpull() {
     s chown iank:iank /i
   fi
   if ! mountpoint /i &>/dev/null; then
-    m sshfs b8.nz:/i /i
+    m sshfs $sshfs_host:/i /i
   fi
 }
 
@@ -1445,7 +1447,7 @@ sm() { # switch mail host
   c /
   # run latest
   keyhash=$(s ssh-keygen -lf /root/.ssh/home  | awk '{print $2}')
-  tmp=$(s ssh-add -l | awk '$2 == "'$keyhash'"')
+  tmp=$(s ssh-add -l | awk '$2 == "'$keyhash'"' ||:)
   if [[ ! $tmp ]]; then
     s ssh-add /root/.ssh/home
   fi