From 0d75f1a3e3b64e73b5d3d4bd8618abba5f534a96 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Tue, 23 Jul 2019 13:17:41 -0400
Subject: fix nasty bug in 'subvolify'

If the argument ends in /, it would break.
---
 dot/bashrc | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dot/bashrc b/dot/bashrc
index c2534bd..19bf544 100644
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -380,12 +380,13 @@ fanspeed()
 
 subvolify()
 {
-    [ -d "$1" ] || return
-    [ -e "$1".subvol~ -o -e "$1".subvol ] && return 1
-    sudo btrfs subvolume create "$1".subvol || return
-    sudo chown --reference="$1" "$1".subvol || return
-    sudo chmod --reference="$1" "$1".subvol || return
-    sudo find "$1" -mindepth 1 -maxdepth 1 -print0 | xargs -0 mv -t "$1".subvol
-    mv "$1" "$1".subvol~
-    mv "$1".subvol "$1"
+    local path
+    path=$(realpath -e "$1") || return
+    [ -e "$path".subvol~ -o -e "$path".subvol ] && return 1
+    sudo btrfs subvolume create "$path".subvol || return
+    sudo chown --reference="$path" "$path".subvol || return
+    sudo chmod --reference="$path" "$path".subvol || return
+    sudo find "$path" -mindepth 1 -maxdepth 1 -print0 | xargs -0 mv -t "$path".subvol
+    mv "$path" "$path".subvol~
+    mv "$path".subvol "$path"
 }
-- 
cgit v1.2.3