diff --git a/ayo.sh b/ayo.sh index da523e1..ea56e72 100755 --- a/ayo.sh +++ b/ayo.sh @@ -1,5 +1,4 @@ -#! /usr/bin/bash - +#! /usr/bin/env bash # Load config . ${HOME}/ayo.conf @@ -30,6 +29,9 @@ case $1 in . ${scripts_dir}/tasks.sh done $2 $3 $4 $5 $6 $7 $8 $9 ;; + nd) # Notes diff + . ${scripts_dir}/notes.sh diff + ;; ns) # Notes sync . ${scripts_dir}/notes.sh sync ;; diff --git a/mac-ayo.sh b/mac-ayo.sh deleted file mode 100755 index baf5ecf..0000000 --- a/mac-ayo.sh +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/bash - - -# Load config -. ${HOME}/ayo.conf -. ${scripts_dir}/functions.sh - -{ - -case $1 in - ## SHORTCUTS - - ja) # journal append - . ${scripts_dir}/journal.sh append $2 $3 $4 $5 $6 $7 $8 $9 - ;; - jt) # journal using typora - . ${scripts_dir}/journal.sh -t $2 $3 $4 $5 $6 $7 $8 $9 - ;; - - tl) # Tasks list - . ${scripts_dir}/tasks.sh list $2 $3 $4 $5 $6 $7 $8 $9 - ;; - to) # Tasks open - . ${scripts_dir}/tasks.sh open $2 $3 $4 $5 $6 $7 $8 $9 - ;; - tr) # Tasks remove - . ${scripts_dir}/tasks.sh remove $2 $3 $4 $5 $6 $7 $8 $9 - ;; - td) # Tasks mark as done - . ${scripts_dir}/tasks.sh done $2 $3 $4 $5 $6 $7 $8 $9 - ;; - - ns) # Notes sync - . ${scripts_dir}/notes.sh sync - ;; - nl) # Notes list - . ${scripts_dir}/notes.sh list $2 $3 $4 $5 $6 $7 $8 $9 - ;; - no) # Notes open - . ${scripts_dir}/notes.sh open $2 $3 $4 $5 $6 $7 $8 $9 - ;; - nr) # Notes remove - . ${scripts_dir}/notes.sh remove $2 $3 $4 $5 $6 $7 $8 $9 - ;; - na) # Notes archive - . ${scripts_dir}/notes.sh archive $2 $3 $4 $5 $6 $7 $8 $9 - ;; - nc) # Notes copy - . ${scripts_dir}/notes.sh copy $2 $3 $4 $5 $6 $7 $8 $9 - ;; - nt) # Notes using typora - . ${scripts_dir}/notes.sh -t $2 $3 $4 $5 $6 $7 $8 $9 - ;; - - gd) # git diff - . ${scripts_dir}/git.sh diff $2 $3 $4 $5 $6 $7 $8 $9 - ;; - gs) # git status - . ${scripts_dir}/git.sh stat $2 $3 $4 $5 $6 $7 $8 $9 - ;; - gp) # git push - . ${scripts_dir}/git.sh push $2 $3 $4 $5 $6 $7 $8 $9 - ;; - - ## SCRIPTS - - u | up) - . ${scripts_dir}/up.sh $2 $3 $4 $5 $6 $7 $8 $9 - ;; - g | git) - . ${scripts_dir}/git.sh $2 $3 $4 $5 $6 $7 $8 $9 - ;; - n | notes) - . ${scripts_dir}/notes.sh $2 $3 $4 $5 $6 $7 $8 $9 - ;; - t | tasks) - . ${scripts_dir}/tasks.sh $2 $3 $4 $5 $6 $7 $8 $9 - ;; - j | journal) - . ${scripts_dir}/journal.sh $2 $3 $4 $5 $6 $7 $8 $9 - ;; - c | config) - echo 'Config script in-progress' - ;; - m | mac) - quickemu --vm ${HOME}/macos-monterey.conf --width 1920 --height 1080 - ;; - ms) - quickemu --vm ${HOME}/macos-monterey.conf --kill - ;; -esac -} diff --git a/notes.sh b/notes.sh index e1bf8f7..cc87598 100755 --- a/notes.sh +++ b/notes.sh @@ -56,8 +56,13 @@ function createNote() { } +## DIFF +if [ "$1" = "diff" ] || [ "$1" = "d" ]; then + cd $notes_dir + git add . + git diff --staged . ## SYNC notes in directory -if [ "$1" = "sync" ] || [ "$1" = "s" ]; then +elif [ "$1" = "sync" ] || [ "$1" = "s" ]; then notesSync ## LIST notes in directory