modified bin/ecrypt, modified statusbar/sb-ecrypt

2 files changed, 6 insertions, 3 deletions

diff --git a/ar/.local/bin/ecrypt b/ar/.local/bin/ecrypt
index 0e189af..0d84081 100755
--- a/ar/.local/bin/ecrypt
+++ b/ar/.local/bin/ecrypt
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 mount_encrypted() {
-  ! mount | grep -q " $1 " && echo "$passphrase" | sudo mount -t ecryptfs "$1" "$2" \
+  echo "$passphrase" | sudo mount -t ecryptfs "$1" "$2" \
     -o ecryptfs_cipher=aes,ecryptfs_key_bytes=32,ecryptfs_passthrough=no,ecryptfs_enable_filename_crypto=yes,ecryptfs_sig=$ecryptfs_sig,ecryptfs_fnek_sig=$fnek_sig,key=passphrase:passphrase_passwd=$(printf '%s' "$passphrase")
 }
 
@@ -21,7 +21,10 @@ attempt_mount() {
       notify-send "❌ Failed to retrieve passphrase."
       exit 1
     }
-    mount_encrypted "$1" "$2" && notify-send "🔑 Unlocked: $3" && pkill -RTMIN+1 dwmblocks
+    if mount_encrypted "$1" "$2"; then
+      notify-send "🔑 Unlocked: $3"
+      pkill -RTMIN+1 dwmblocks
+    fi
   fi
 }
 
diff --git a/ar/.local/bin/statusbar/sb-ecrypt b/ar/.local/bin/statusbar/sb-ecrypt
index 9ba6e26..499cb7e 100755
--- a/ar/.local/bin/statusbar/sb-ecrypt
+++ b/ar/.local/bin/statusbar/sb-ecrypt
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 case $BLOCK_BUTTON in
-1) "${XDG_SCRIPTS_HOME:-${HOME}/.local/bin}/ecrypt" ;;
+1) "${XDG_SCRIPTS_HOME:-${HOME}/.local/bin}/ecrypt" >/dev/null ;;
 3) notify-send "🔒 Encrypted Media Folder " "\- Shows mount status of Media
 - Left click to toggle mount" ;;
 6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;