X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=9fa1010920e6767057a1699531c519423e973d4b;hb=e958999a4ab6fddd723270b596b4899c0811fa41;hp=bd959d82dc824b6e597a10df51f9906f2c8633ec;hpb=608a1255fc3700611bdabdc9c8635940ac3390af;p=distro-setup

diff --git a/brc2 b/brc2
index bd959d8..9fa1010 100644
--- a/brc2
+++ b/brc2
@@ -1085,31 +1085,31 @@ lom() {
     l=$(losetup -j $1 | sed -rn 's/^([^ ]+): .*/\1/p' | head -n1 ||:)
     if [[ ! $l ]]; then
       l=$(sudo losetup -f)
-      sudo losetup $l $1
+      m sudo losetup $l $1
     fi
     if ! sudo cryptsetup status /dev/mapper/$base &>/dev/null; then
       if ! sudo cryptsetup luksOpen $l $base; then
-        sudo losetup -d $l
+        m sudo losetup -d $l
         return 1
       fi
     fi
-    sudo mkdir -p /mnt/$base
-    sudo mount /dev/mapper/$base /mnt/$base
-    sudo chown $USER:$USER /mnt/$base
+    m sudo mkdir -p /mnt/$base
+    m sudo mount /dev/mapper/$base /mnt/$base
+    m sudo chown $USER:$USER /mnt/$base
   else
     base=$1
     if mountpoint /mnt/$base &>/dev/null; then
-      sudo umount /mnt/$base
+      m sudo umount /mnt/$base
     fi
     if sudo cryptsetup status /dev/mapper/$base &>/dev/null; then
-      if ! sudo cryptsetup luksClose /dev/mapper/$base; then
+      if ! m sudo cryptsetup luksClose /dev/mapper/$base; then
         echo lom: failed cryptsetup luksClose /dev/mapper/$base
         return 1
       fi
     fi
-    l=$(losetup -j $1 | sed -rn 's/^([^ ]+): .*/\1/p' | head -n1 ||:)
+    l=$(losetup -l --noheadings | awk '$6 ~ /\/'$1'$/ {print $1}')
     if [[ $l ]]; then
-      sudo losetup -d $l
+      m sudo losetup -d $l
     else
       echo lom: warning: no loopback device found
     fi
@@ -1266,6 +1266,9 @@ ngo() {
 otp() {
   oathtool --totp -b "$*" | xclip -selection clipboard
 }
+j() {
+  "$@" |& pee "xclip -r -selection clipboard"
+}
 
 
 pakaraoke() {