improvements

1 files changed, 18 insertions, 9 deletions

diff --git a/dot/bashrc b/dot/bashrc
index aa1c803..d88a287 100644
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -380,16 +380,19 @@ fanspeed()
 
 subvolify()
 {
-    local path
+    local path sudo
     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"
-    rmdir "$path".subvol~ || true
+    if [ "$(id -u)" = 0 ]; then sudo=; else sudo=sudo; fi  
+
+    [ ! -e "$path".subvol~ ] || return
+    [ ! -e "$path".subvol ] || return
+    $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
+    $sudo mv -T "$path" "$path".subvol~
+    $sudo mv -T "$path".subvol "$path"
+    $sudo rmdir "$path".subvol~ || true
 }
 
 fkill()
@@ -442,6 +445,12 @@ get_stack()
   else wget -qO- https://get.haskellstack.org/ | sh
   fi
 }
+alias get_haskell=get_stack
+
+get_rust()
+{
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+}
 
 local_bashrc=~/.bashrc.$(hostname)