diff --git a/.zprezto/abra/functions.zsh b/.zprezto/abra/functions.zsh index 4f2ecff..54a6264 100644 --- a/.zprezto/abra/functions.zsh +++ b/.zprezto/abra/functions.zsh @@ -12,26 +12,33 @@ function mount_sshfs { return 1 fi - local MOUNT_PATH="/Users/abra/mount/$1" + local MOUNT_PATH="/Users/$USER/mount/$1" mkdir -p "$MOUNT_PATH" - umount "$MOUNT_PATH" || true; + if mount | grep "$MOUNT_PATH"; then + umount "$MOUNT_PATH"; + fi sshfs \ -o allow_other \ + -o kernel_cache \ + -o direct_io \ + -o auto_cache \ -o defer_permissions \ + -o noappledouble \ -o cache=yes \ - -o Compression=no \ + -o Compression=yes \ -o reconnect \ -o workaround=rename \ "$1:$2" "$MOUNT_PATH" local REMOTE_COMMAND_PIPE_PATH="/projects/subl_remote/fifo" - local LOCAL_COMMAND_PIPE_PATH="/Users/abra/mount/$1/$REMOTE_COMMAND_PIPE_PATH" + local LOCAL_COMMAND_PIPE_PATH="/Users/$USER/mount/$1/$REMOTE_COMMAND_PIPE_PATH" if [[ ! -e "$LOCAL_COMMAND_PIPE_PATH" ]]; then - echo "Can't file the command pipe" + echo "Can't find the command pipe" + return fi echo "Starting remote command pipe..." @@ -124,19 +131,19 @@ function strip-tags { | xargs -0 -n1 mid3v2 --delete-frames=TXXX,USLT,TIPL,UFID,APIC,TBPM,TCMP,TDOR,TDRC,TLAN,TMED,TPOS,TPUB,TRCK,TCON } -function dedi-beet { +function levi_beet { FUNCTION_PRELUDE - ssh dedi -- sudo -u torrent-user beet "$@" + ssh levi -- sudo BEETSDIR=/projects/config/beets -u torrent beet "$@" } -function beet-comments { +function beet_comments { FUNCTION_PRELUDE : "${1:?who?}" : "${2:?what?}" - dedi-beet modify \'"comments=$2"\' \'"albumartist::$1"\' + levi_beet modify \'"comments=$2"\' \'"albumartist::$1"\' } function rsync2 { @@ -164,12 +171,14 @@ function sync-music { # return 1 # fi - mkdir -p "$HOME/music/library" + local MUSIC_DIR="$HOME/music/library" + + mkdir -p "$MUSIC_DIR" rsync2 \ --delete \ - "dedi:/home/torrent-user/music-library/" \ - "$HOME/music/library/" + "levi:/projects/music/" \ + "$MUSIC_DIR/" } # function .g-init() {