From 46704e9e375805dad467d3b90ad86a246e6327e4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 19 Nov 2024 09:17:14 +0100 Subject: [PATCH] sa --- sh/alias/apt.sh | 48 ++++----- sh/alias/batcat.sh | 4 +- sh/alias/btrfs.sh | 36 +++---- sh/alias/byobu.sh | 16 +-- sh/alias/chmod.sh | 8 +- sh/alias/chown.sh | 8 +- sh/alias/clear.sh | 4 +- sh/alias/cp.sh | 4 +- sh/alias/emacs.sh | 4 +- sh/alias/evince.sh | 4 +- sh/alias/git.sh | 242 +++++++++++++++++++++---------------------- sh/alias/grep.sh | 4 +- sh/alias/kill.sh | 8 +- sh/alias/killall.sh | 8 +- sh/alias/ls.sh | 16 +-- sh/alias/lsblk.sh | 16 +-- sh/alias/mkdir.sh | 8 +- sh/alias/mount.sh | 4 +- sh/alias/mv.sh | 4 +- sh/alias/nano.sh | 4 +- sh/alias/newsboat.sh | 4 +- sh/alias/pass.sh | 8 +- sh/alias/pgrep.sh | 4 +- sh/alias/pwgen.sh | 10 +- sh/alias/rm.sh | 4 +- sh/alias/rsync.sh | 16 +-- sh/alias/tar.sh | 22 ++-- sh/alias/tmux.sh | 4 +- sh/alias/tree.sh | 8 +- 29 files changed, 265 insertions(+), 265 deletions(-) diff --git a/sh/alias/apt.sh b/sh/alias/apt.sh index 4747c81..1af6d78 100644 --- a/sh/alias/apt.sh +++ b/sh/alias/apt.sh @@ -1,94 +1,94 @@ # show package information -acl() { sh_a__apt_cache_list "${@}"; } -sh_a__apt_cache_list() { +acl() { sa__apt_cache_list "${@}"; } +sa__apt_cache_list() { apt-cache \ show \ "${@}" } # package versions policy -acp() { sh_a__apt_cache_policy "${@}"; } -sh_a__apt_cache_policy() { +acp() { sa__apt_cache_policy "${@}"; } +sa__apt_cache_policy() { apt-cache \ policy \ "${@}" } # search package -acs() { sh_a__apt_cache_search "${@}"; } -sh_a__apt_cache_search() { +acs() { sa__apt_cache_search "${@}"; } +sa__apt_cache_search() { apt-cache \ search \ "${@}" } # -agap() { sh_a__apt_get_auto_purge "${@}"; } -sh_a__apt_get_auto_purge() { +agap() { sa__apt_get_auto_purge "${@}"; } +sa__apt_get_auto_purge() { apt-get \ autopurge \ "${@}" } # -agar() { sh_a__apt_get_auto_remove "${@}"; } -sh_a__apt_get_auto_remove() { +agar() { sa__apt_get_auto_remove "${@}"; } +sa__apt_get_auto_remove() { apt-get \ autoremove \ "${@}" } # clean packages cache -agc() { sh_a__apt_get_clean "${@}"; } -sh_a__apt_get_clean() { +agc() { sa__apt_get_clean "${@}"; } +sa__apt_get_clean() { apt-get \ clean \ "${@}" } # upgrade allowing package installation or removal -agfu() { sh_a__apt_get_full_upgrade "${@}"; } -sh_a__apt_get_full_upgrade() { +agfu() { sa__apt_get_full_upgrade "${@}"; } +sa__apt_get_full_upgrade() { apt-get \ full-upgrade \ "${@}" } # install packages -agi() { sh_a__apt_get_install "${@}"; } -sh_a__apt_get_install() { +agi() { sa__apt_get_install "${@}"; } +sa__apt_get_install() { apt-get \ install \ "${@}" } # -agp() { sh_a__apt_get_purge "${@}"; } -sh_a__apt_get_purge() { +agp() { sa__apt_get_purge "${@}"; } +sa__apt_get_purge() { apt-get \ purge \ "${@}" } # -agr() { sh_a__apt_get_remove "${@}"; } -sh_a__apt_get_remove() { +agr() { sa__apt_get_remove "${@}"; } +sa__apt_get_remove() { apt-get \ remove \ "${@}" } # update packages catalog -agud() { sh_a__apt_get_up_date "${@}"; } -sh_a__apt_get_up_date() { +agud() { sa__apt_get_up_date "${@}"; } +sa__apt_get_up_date() { apt-get \ update \ "${@}" } # upgrade forbidding package installation or removal -agug() { sh_a__apt_get_up_grade "${@}"; } -sh_a__apt_get_up_grade() { +agug() { sa__apt_get_up_grade "${@}"; } +sa__apt_get_up_grade() { apt-get \ upgrade \ "${@}" diff --git a/sh/alias/batcat.sh b/sh/alias/batcat.sh index e31ab6d..4d5968b 100644 --- a/sh/alias/batcat.sh +++ b/sh/alias/batcat.sh @@ -1,5 +1,5 @@ -bat() { sh_a__b_a_t "${@}"; } -sh_a__b_a_t() { +bat() { sa__b_a_t "${@}"; } +sa__b_a_t() { batcat \ "${@}" } diff --git a/sh/alias/btrfs.sh b/sh/alias/btrfs.sh index 3ec74fb..eb48c14 100644 --- a/sh/alias/btrfs.sh +++ b/sh/alias/btrfs.sh @@ -1,13 +1,13 @@ -bfdf() { sh_a__btrfs_filesystem_d_f "${@}"; } -sh_a__btrfs_filesystem_d_f() { +bfdf() { sa__btrfs_filesystem_d_f "${@}"; } +sa__btrfs_filesystem_d_f() { btrfs \ filesystem \ df \ "${@}" } -bfdu() { sh_a__btrfs_filesystem_d_u "${@}"; } -sh_a__btrfs_filesystem_d_u() { +bfdu() { sa__btrfs_filesystem_d_u "${@}"; } +sa__btrfs_filesystem_d_u() { btrfs \ filesystem \ du \ @@ -15,40 +15,40 @@ sh_a__btrfs_filesystem_d_u() { "${@}" } -bfu() { sh_a__btrfs_filesystem_usage "${@}"; } -sh_a__btrfs_filesystem_usage() { +bfu() { sa__btrfs_filesystem_usage "${@}"; } +sa__btrfs_filesystem_usage() { btrfs \ filesystem \ usage \ "${@}" } -bpg() { sh_a__btrfs_property_get "${@}"; } -sh_a__btrfs_property_get() { +bpg() { sa__btrfs_property_get "${@}"; } +sa__btrfs_property_get() { btrfs \ property \ get \ "${@}" } -bsc() { sh_a__btrfs_subvolume_create "${@}"; } -sh_a__btrfs_subvolume_create() { +bsc() { sa__btrfs_subvolume_create "${@}"; } +sa__btrfs_subvolume_create() { btrfs \ subvolume \ create \ "${@}" } -bsd() { sh_a__btrfs_subvolume_delete "${@}"; } -sh_a__btrfs_subvolume_delete() { +bsd() { sa__btrfs_subvolume_delete "${@}"; } +sa__btrfs_subvolume_delete() { btrfs \ subvolume \ delete \ "${@}" } -bsl() { sh_a__btrfs_subvolume_list "${@}"; } -sh_a__btrfs_subvolume_list() { +bsl() { sa__btrfs_subvolume_list "${@}"; } +sa__btrfs_subvolume_list() { if [ -n "${1}" ]; then btrfs subvolume list "${1}" | cut --delimiter " " --fields 9 | @@ -56,16 +56,16 @@ sh_a__btrfs_subvolume_list() { fi } -bss() { sh_a__btrfs_subvolume_snapshot "${@}"; } -sh_a__btrfs_subvolume_snapshot() { +bss() { sa__btrfs_subvolume_snapshot "${@}"; } +sa__btrfs_subvolume_snapshot() { btrfs \ subvolume \ snapshot \ "${@}" } -bssr() { sh_a__btrfs_subvolume_snapshot_r "${@}"; } -sh_a__btrfs_subvolume_snapshot_r() { +bssr() { sa__btrfs_subvolume_snapshot_r "${@}"; } +sa__btrfs_subvolume_snapshot_r() { btrfs \ subvolume \ snapshot -r \ diff --git a/sh/alias/byobu.sh b/sh/alias/byobu.sh index 79155b5..6b66a77 100644 --- a/sh/alias/byobu.sh +++ b/sh/alias/byobu.sh @@ -1,25 +1,25 @@ -bb() { sh_a__byo_bu "${@}"; } -sh_a__byo_bu() { +bb() { sa__byo_bu "${@}"; } +sa__byo_bu() { byobu \ "${@}" } -bba() { sh_a__byo_bu_attach "${@}"; } -sh_a__byo_bu_attach() { +bba() { sa__byo_bu_attach "${@}"; } +sa__byo_bu_attach() { byobu \ attach-session \ "${@}" } -bbl() { sh_a__byo_bu_ls "${@}"; } -sh_a__byo_bu_ls() { +bbl() { sa__byo_bu_ls "${@}"; } +sa__byo_bu_ls() { byobu \ ls \ "${@}" } -bbnd() { sh_a__byo_bu_new_detach "${@}"; } -sh_a__byo_bu_new_detach() { +bbnd() { sa__byo_bu_new_detach "${@}"; } +sa__byo_bu_new_detach() { byobu \ new-session \ -d \ diff --git a/sh/alias/chmod.sh b/sh/alias/chmod.sh index 1c55b40..6a6e0e8 100644 --- a/sh/alias/chmod.sh +++ b/sh/alias/chmod.sh @@ -1,14 +1,14 @@ # change mode to directory -cmd() { sh_a__change_mode_directory "${@}"; } -sh_a__change_mode_directory() { +cmd() { sa__change_mode_directory "${@}"; } +sa__change_mode_directory() { chmod \ "755" \ "${@}" } # change mode to file -cmf() { sh_a__change_mode_file "${@}"; } -sh_a__change_mode_file() { +cmf() { sa__change_mode_file "${@}"; } +sa__change_mode_file() { chmod \ "644" \ "${@}" diff --git a/sh/alias/chown.sh b/sh/alias/chown.sh index 6a7a156..8c992d3 100644 --- a/sh/alias/chown.sh +++ b/sh/alias/chown.sh @@ -1,14 +1,14 @@ # change owner to root -cor() { sh_a__change_owner_root "${@}"; } -sh_a__change_owner_root() { +cor() { sa__change_owner_root "${@}"; } +sa__change_owner_root() { chown \ "0:0" \ "${@}" } # change owner to user -cou() { sh_a__change_owner_user "${@}"; } -sh_a__change_owner_user() { +cou() { sa__change_owner_user "${@}"; } +sa__change_owner_user() { chown \ "1000:1000" \ "${@}" diff --git a/sh/alias/clear.sh b/sh/alias/clear.sh index 9731fe0..542a260 100644 --- a/sh/alias/clear.sh +++ b/sh/alias/clear.sh @@ -1,6 +1,6 @@ # clear terminal -c() { sh_a__clear "${@}"; } -sh_a__clear() { +c() { sa__clear "${@}"; } +sa__clear() { clear \ "${@}" } diff --git a/sh/alias/cp.sh b/sh/alias/cp.sh index dd1a271..d8897c0 100644 --- a/sh/alias/cp.sh +++ b/sh/alias/cp.sh @@ -1,6 +1,6 @@ # copy interactively -cpi() { sh_a__co_py_interactive "${@}"; } -sh_a__co_py_interactive() { +cpi() { sa__co_py_interactive "${@}"; } +sa__co_py_interactive() { cp \ --interactive \ "${@}" diff --git a/sh/alias/emacs.sh b/sh/alias/emacs.sh index 84fc56f..cc7e002 100644 --- a/sh/alias/emacs.sh +++ b/sh/alias/emacs.sh @@ -1,5 +1,5 @@ -em() { sh_a__e_macs "${@}"; } -sh_a__e_macs() { +em() { sa__e_macs "${@}"; } +sa__e_macs() { emacs \ "${@}" } diff --git a/sh/alias/evince.sh b/sh/alias/evince.sh index 3c609ef..5d68ace 100644 --- a/sh/alias/evince.sh +++ b/sh/alias/evince.sh @@ -1,5 +1,5 @@ -ev() { sh_a__e_vince "${@}"; } -sh_a__e_vince() { +ev() { sa__e_vince "${@}"; } +sa__e_vince() { evince \ "${@}" } diff --git a/sh/alias/git.sh b/sh/alias/git.sh index 864620b..5ce2f93 100644 --- a/sh/alias/git.sh +++ b/sh/alias/git.sh @@ -8,16 +8,16 @@ C %C(blue)%cn %ce %B" # add to index -ga() { sh_a__git_add "${@}"; } -sh_a__git_add() { +ga() { sa__git_add "${@}"; } +sa__git_add() { git \ add \ "${@}" } # add all to index -gaa() { sh_a__git_add_all "${@}"; } -sh_a__git_add_all() { +gaa() { sa__git_add_all "${@}"; } +sa__git_add_all() { git \ add \ --all \ @@ -25,8 +25,8 @@ sh_a__git_add_all() { } # add parts of all to index -gaap() { sh_a__git_add_all_patch "${@}"; } -sh_a__git_add_all_patch() { +gaap() { sa__git_add_all_patch "${@}"; } +sa__git_add_all_patch() { git \ add \ --all \ @@ -35,8 +35,8 @@ sh_a__git_add_all_patch() { } # add parts to index -gap() { sh_a__git_add_patch "${@}"; } -sh_a__git_add_patch() { +gap() { sa__git_add_patch "${@}"; } +sa__git_add_patch() { git \ add \ --patch \ @@ -44,16 +44,16 @@ sh_a__git_add_patch() { } # create a branch -gb() { sh_a__git_branch "${@}"; } -sh_a__git_branch() { +gb() { sa__git_branch "${@}"; } +sa__git_branch() { git \ branch \ "${@}" } # delete a branch -gbd() { sh_a__git_branch_delete "${@}"; } -sh_a__git_branch_delete() { +gbd() { sa__git_branch_delete "${@}"; } +sa__git_branch_delete() { git \ branch \ --delete \ @@ -61,8 +61,8 @@ sh_a__git_branch_delete() { } # force a branch deletion -gbdf() { sh_a__git_branch_delete_force "${@}"; } -sh_a__git_branch_delete_force() { +gbdf() { sa__git_branch_delete_force "${@}"; } +sa__git_branch_delete_force() { git \ branch \ --delete \ @@ -71,8 +71,8 @@ sh_a__git_branch_delete_force() { } # list branches -gbl() { sh_a__git_branch_list "${@}"; } -sh_a__git_branch_list() { +gbl() { sa__git_branch_list "${@}"; } +sa__git_branch_list() { git \ branch \ --all \ @@ -83,8 +83,8 @@ sh_a__git_branch_list() { } # set the link to a remote branch from a local branch -gbsu() { sh_a__git_branch_set_upstream "${@}"; } -sh_a__git_branch_set_upstream() { +gbsu() { sa__git_branch_set_upstream "${@}"; } +sa__git_branch_set_upstream() { git \ branch \ --set-upstream-to \ @@ -92,16 +92,16 @@ sh_a__git_branch_set_upstream() { } # switch to a branch or checkout file(s) from a commit -gc() { sh_a__git_checkout "${@}"; } -sh_a__git_checkout() { +gc() { sa__git_checkout "${@}"; } +sa__git_checkout() { git \ checkout \ "${@}" } # checkout an orphan branch -gco() { sh_a__git_checkout_orphan "${@}"; } -sh_a__git_checkout_orphan() { +gco() { sa__git_checkout_orphan "${@}"; } +sa__git_checkout_orphan() { git \ checkout \ --orphan \ @@ -109,16 +109,16 @@ sh_a__git_checkout_orphan() { } # pick a commit -gcp() { sh_a__git_cherry_pick "${@}"; } -sh_a__git_cherry_pick() { +gcp() { sa__git_cherry_pick "${@}"; } +sa__git_cherry_pick() { git \ cherry-pick \ "${@}" } # abort the commit pick -gcpa() { sh_a__git_cherry_pick_abort "${@}"; } -sh_a__git_cherry_pick_abort() { +gcpa() { sa__git_cherry_pick_abort "${@}"; } +sa__git_cherry_pick_abort() { git \ cherry-pick \ --abort \ @@ -126,8 +126,8 @@ sh_a__git_cherry_pick_abort() { } # continue the commit pick -gcpc() { sh_a__git_cherry_pick_continue "${@}"; } -sh_a__git_cherry_pick_continue() { +gcpc() { sa__git_cherry_pick_continue "${@}"; } +sa__git_cherry_pick_continue() { git \ cherry-pick \ --continue \ @@ -135,8 +135,8 @@ sh_a__git_cherry_pick_continue() { } # clean untracked files -gcf() { sh_a__git_clean_force "${@}"; } -sh_a__git_clean_force() { +gcf() { sa__git_clean_force "${@}"; } +sa__git_clean_force() { git \ clean \ -d \ @@ -145,8 +145,8 @@ sh_a__git_clean_force() { } # redo the last commit with a different message -gcam() { sh_a__git_commit_amend_message "${@}"; } -sh_a__git_commit_amend_message() { +gcam() { sa__git_commit_amend_message "${@}"; } +sa__git_commit_amend_message() { git \ commit \ --amend \ @@ -155,8 +155,8 @@ sh_a__git_commit_amend_message() { } # make a root commit -gcem() { sh_a__git_commit_empty_message "${@}"; } -sh_a__git_commit_empty_message() { +gcem() { sa__git_commit_empty_message "${@}"; } +sa__git_commit_empty_message() { git \ commit \ --allow-empty \ @@ -166,8 +166,8 @@ sh_a__git_commit_empty_message() { } # commit the index -gcm() { sh_a__git_commit_message "${@}"; } -sh_a__git_commit_message() { +gcm() { sa__git_commit_message "${@}"; } +sa__git_commit_message() { git \ commit \ --message \ @@ -175,8 +175,8 @@ sh_a__git_commit_message() { } # configure the user email -gcue() { sh_a__git_config_user_email "${@}"; } -sh_a__git_config_user_email() { +gcue() { sa__git_config_user_email "${@}"; } +sa__git_config_user_email() { git \ config \ "user.email" \ @@ -184,8 +184,8 @@ sh_a__git_config_user_email() { } # configure the user name -gcun() { sh_a__git_config_user_name "${@}"; } -sh_a__git_config_user_name() { +gcun() { sa__git_config_user_name "${@}"; } +sa__git_config_user_name() { git \ config \ "user.name" \ @@ -193,16 +193,16 @@ sh_a__git_config_user_name() { } # differences from last or between commits -gd() { sh_a__git_diff "${@}"; } -sh_a__git_diff() { +gd() { sa__git_diff "${@}"; } +sa__git_diff() { git \ diff \ "${@}" } # display what is indexed in cache -gdc() { sh_a__git_diff_cached "${@}"; } -sh_a__git_diff_cached() { +gdc() { sa__git_diff_cached "${@}"; } +sa__git_diff_cached() { git \ diff \ --cached \ @@ -210,8 +210,8 @@ sh_a__git_diff_cached() { } # indexed character-level differences -gdcw() { sh_a__git_diff_cached_word "${@}"; } -sh_a__git_diff_cached_word() { +gdcw() { sa__git_diff_cached_word "${@}"; } +sa__git_diff_cached_word() { git \ diff \ --cached \ @@ -220,8 +220,8 @@ sh_a__git_diff_cached_word() { } # differences via external tool -gdt() { sh_a__git_diff_tool "${@}"; } -sh_a__git_diff_tool() { +gdt() { sa__git_diff_tool "${@}"; } +sa__git_diff_tool() { git \ difftool \ --dir-diff \ @@ -229,8 +229,8 @@ sh_a__git_diff_tool() { } # character-level differences -gdw() { sh_a__git_diff_word "${@}"; } -sh_a__git_diff_word() { +gdw() { sa__git_diff_word "${@}"; } +sa__git_diff_word() { git \ diff \ --word-diff-regex "." \ @@ -238,8 +238,8 @@ sh_a__git_diff_word() { } # fetch from the remote repository -gf() { sh_a__git_fetch "${@}"; } -sh_a__git_fetch() { +gf() { sa__git_fetch "${@}"; } +sa__git_fetch() { git \ fetch \ --tags \ @@ -248,16 +248,16 @@ sh_a__git_fetch() { } # fetch from remote repository and prune local orphan branches -gfp() { sh_a__git_fetch_prune "${@}"; } -sh_a__git_fetch_prune() { - sh_a__git_fetch \ +gfp() { sa__git_fetch_prune "${@}"; } +sa__git_fetch_prune() { + sa__git_fetch \ --prune \ "${@}" } # garbage collect all orphan commits -ggc() { sh_a__git_garbage_collect "${@}"; } -sh_a__git_garbage_collect() { +ggc() { sa__git_garbage_collect "${@}"; } +sa__git_garbage_collect() { git \ reflog \ expire \ @@ -270,16 +270,16 @@ sh_a__git_garbage_collect() { } # initialize a new repository -gi() { sh_a__git_init "${@}"; } -sh_a__git_init() { +gi() { sa__git_init "${@}"; } +sa__git_init() { git \ init \ "${@}" } # initialize a new bare repository -gib() { sh_a__git_init_bare "${@}"; } -sh_a__git_init_bare() { +gib() { sa__git_init_bare "${@}"; } +sa__git_init_bare() { git \ init \ --bare \ @@ -287,8 +287,8 @@ sh_a__git_init_bare() { } # log history -gl() { sh_a__git_log "${@}"; } -sh_a__git_log() { +gl() { sa__git_log "${@}"; } +sa__git_log() { git \ log \ --abbrev=8 \ @@ -299,33 +299,33 @@ sh_a__git_log() { } # log all history -gla() { sh_a__git_log_all "${@}"; } -sh_a__git_log_all() { - sh_a__git_log \ +gla() { sa__git_log_all "${@}"; } +sa__git_log_all() { + sa__git_log \ --all \ "${@}" } # log all history with patches -glap() { sh_a__git_log_all_patch "${@}"; } -sh_a__git_log_all_patch() { - sh_a__git_log \ +glap() { sa__git_log_all_patch "${@}"; } +sa__git_log_all_patch() { + sa__git_log \ --all \ --patch \ "${@}" } # log history with patches -glp() { sh_a__git_log_patch "${@}"; } -sh_a__git_log_patch() { - sh_a__git_log \ +glp() { sa__git_log_patch "${@}"; } +sa__git_log_patch() { + sa__git_log \ --patch \ "${@}" } # fast-forward merge to remote branch -gm() { sh_a__git_merge "${@}"; } -sh_a__git_merge() { +gm() { sa__git_merge "${@}"; } +sa__git_merge() { git \ merge \ --ff-only \ @@ -333,8 +333,8 @@ sh_a__git_merge() { } # abort the current merge commit -gma() { sh_a__git_merge_abort "${@}"; } -sh_a__git_merge_abort() { +gma() { sa__git_merge_abort "${@}"; } +sa__git_merge_abort() { git \ merge \ --abort \ @@ -342,8 +342,8 @@ sh_a__git_merge_abort() { } # do a merge commit -gmc() { sh_a__git_merge_commit "${@}"; } -sh_a__git_merge_commit() { +gmc() { sa__git_merge_commit "${@}"; } +sa__git_merge_commit() { git \ merge \ --no-ff \ @@ -352,8 +352,8 @@ sh_a__git_merge_commit() { } # squash a branch and index its modifications -gms() { sh_a__git_merge_squash "${@}"; } -sh_a__git_merge_squash() { +gms() { sa__git_merge_squash "${@}"; } +sa__git_merge_squash() { git \ merge \ --squash \ @@ -361,16 +361,16 @@ sh_a__git_merge_squash() { } # merge via external tool -gmt() { sh_a__git_merge_tool "${@}"; } -sh_a__git_merge_tool() { +gmt() { sa__git_merge_tool "${@}"; } +sa__git_merge_tool() { git \ mergetool \ "${@}" } # push to the remote repository -gp() { sh_a__git_push "${@}"; } -sh_a__git_push() { +gp() { sa__git_push "${@}"; } +sa__git_push() { git \ push \ --tags \ @@ -379,8 +379,8 @@ sh_a__git_push() { } # delete from the remote repository -gpd() { sh_a__git_push_delete "${@}"; } -sh_a__git_push_delete() { +gpd() { sa__git_push_delete "${@}"; } +sa__git_push_delete() { git \ push \ --delete \ @@ -388,24 +388,24 @@ sh_a__git_push_delete() { } # force the push to the remote repository -gpf() { sh_a__git_push_force "${@}"; } -sh_a__git_push_force() { - sh_a__git_push \ +gpf() { sa__git_push_force "${@}"; } +sa__git_push_force() { + sa__git_push \ --force \ "${@}" } # rebase current branch onto another -grb() { sh_a__git_re_base "${@}"; } -sh_a__git_re_base() { +grb() { sa__git_re_base "${@}"; } +sa__git_re_base() { git \ rebase \ "${@}" } # abort current rebase -grba() { sh_a__git_re_base_abort "${@}"; } -sh_a__git_re_base_abort() { +grba() { sa__git_re_base_abort "${@}"; } +sa__git_re_base_abort() { git \ rebase \ --abort \ @@ -413,8 +413,8 @@ sh_a__git_re_base_abort() { } # continue current rebase -grbc() { sh_a__git_re_base_continue "${@}"; } -sh_a__git_re_base_continue() { +grbc() { sa__git_re_base_continue "${@}"; } +sa__git_re_base_continue() { git \ rebase \ --continue \ @@ -422,8 +422,8 @@ sh_a__git_re_base_continue() { } # force rebase without fast-forward -grbf() { sh_a__git_re_base_force "${@}"; } -sh_a__git_re_base_force() { +grbf() { sa__git_re_base_force "${@}"; } +sa__git_re_base_force() { git \ rebase \ --force-rebase \ @@ -431,8 +431,8 @@ sh_a__git_re_base_force() { } # rebase interactively -grbi() { sh_a__git_re_base_interactive "${@}"; } -sh_a__git_re_base_interactive() { +grbi() { sa__git_re_base_interactive "${@}"; } +sa__git_re_base_interactive() { git \ rebase \ --interactive \ @@ -440,8 +440,8 @@ sh_a__git_re_base_interactive() { } # add a new remote repository -grma() { sh_a__git_re_mote_add "${@}"; } -sh_a__git_re_mote_add() { +grma() { sa__git_re_mote_add "${@}"; } +sa__git_re_mote_add() { git \ remote \ add \ @@ -449,8 +449,8 @@ sh_a__git_re_mote_add() { } # list remote repositories -grml() { sh_a__git_re_mote_list "${@}"; } -sh_a__git_re_mote_list() { +grml() { sa__git_re_mote_list "${@}"; } +sa__git_re_mote_list() { git \ remote \ --verbose \ @@ -458,8 +458,8 @@ sh_a__git_re_mote_list() { } # set the location of a remote repository -grmsu() { sh_a__git_re_mote_set_upstream "${@}"; } -sh_a__git_re_mote_set_upstream() { +grmsu() { sa__git_re_mote_set_upstream "${@}"; } +sa__git_re_mote_set_upstream() { git \ remote \ set-url \ @@ -467,8 +467,8 @@ sh_a__git_re_mote_set_upstream() { } # show connection to a remote repository -grms() { sh_a__git_re_mote_show "${@}"; } -sh_a__git_re_mote_show() { +grms() { sa__git_re_mote_show "${@}"; } +sa__git_re_mote_show() { git \ remote \ show \ @@ -476,24 +476,24 @@ sh_a__git_re_mote_show() { } # remove and add removal to index -grm() { sh_a__git_re_move "${@}"; } -sh_a__git_re_move() { +grm() { sa__git_re_move "${@}"; } +sa__git_re_move() { git \ rm \ "${@}" } # remove file(s) from index or move current branch pointer -grs() { sh_a__git_re_set "${@}"; } -sh_a__git_re_set() { +grs() { sa__git_re_set "${@}"; } +sa__git_re_set() { git \ reset \ "${@}" } # wipe modifications or reset current branch to another commit -grsh() { sh_a__git_re_set_hard "${@}"; } -sh_a__git_re_set_hard() { +grsh() { sa__git_re_set_hard "${@}"; } +sa__git_re_set_hard() { git \ reset \ --hard \ @@ -501,16 +501,16 @@ sh_a__git_re_set_hard() { } # show a commit -gsc() { sh_a__git_show_commit "${@}"; } -sh_a__git_show_commit() { +gsc() { sa__git_show_commit "${@}"; } +sa__git_show_commit() { git \ show \ "${@}" } # current state of repository -gs() { sh_a__git_status "${@}"; } -sh_a__git_status() { +gs() { sa__git_status "${@}"; } +sa__git_status() { git \ status \ --untracked-files="all" \ @@ -518,16 +518,16 @@ sh_a__git_status() { } # tag a commit -gt() { sh_a__git_tag "${@}"; } -sh_a__git_tag() { +gt() { sa__git_tag "${@}"; } +sa__git_tag() { git \ tag \ "${@}" } # delete a tag -gtd() { sh_a__git_tag_delete "${@}"; } -sh_a__git_tag_delete() { +gtd() { sa__git_tag_delete "${@}"; } +sa__git_tag_delete() { git \ tag \ --delete \ diff --git a/sh/alias/grep.sh b/sh/alias/grep.sh index e4fe62f..d479936 100644 --- a/sh/alias/grep.sh +++ b/sh/alias/grep.sh @@ -1,6 +1,6 @@ # grep from current directory with regex -g() { sh_a__grep "${@}"; } -sh_a__grep() { +g() { sa__grep "${@}"; } +sa__grep() { grep \ --directories "recurse" \ --line-number \ diff --git a/sh/alias/kill.sh b/sh/alias/kill.sh index ce47bd9..1900a2d 100644 --- a/sh/alias/kill.sh +++ b/sh/alias/kill.sh @@ -1,13 +1,13 @@ # kill a process by id -k() { sh_a__kill "${@}"; } -sh_a__kill() { +k() { sa__kill "${@}"; } +sa__kill() { kill \ "${@}" } # force kill a process by id -kf() { sh_a__kill_force "${@}"; } -sh_a__kill_force() { +kf() { sa__kill_force "${@}"; } +sa__kill_force() { kill \ -9 \ "${@}" diff --git a/sh/alias/killall.sh b/sh/alias/killall.sh index 0f63b0e..b12e515 100644 --- a/sh/alias/killall.sh +++ b/sh/alias/killall.sh @@ -1,13 +1,13 @@ # kill all instances of a process by name -ka() { sh_a__kill_all "${@}"; } -sh_a__kill_all() { +ka() { sa__kill_all "${@}"; } +sa__kill_all() { killall \ "${@}" } # force kill all instances of a process by name -kaf() { sh_a__kill_all_force "${@}"; } -sh_a__kill_all_force() { +kaf() { sa__kill_all_force "${@}"; } +sa__kill_all_force() { killall \ -9 \ "${@}" diff --git a/sh/alias/ls.sh b/sh/alias/ls.sh index f464b3a..5c90ee5 100644 --- a/sh/alias/ls.sh +++ b/sh/alias/ls.sh @@ -3,8 +3,8 @@ di=0;94\ " # list current directory’s entries -l() { sh_a__ls "${@}"; } -sh_a__ls() { +l() { sa__ls "${@}"; } +sa__ls() { ls \ --all \ --color \ @@ -15,17 +15,17 @@ sh_a__ls() { } # list timestamps -lt() { sh_a__ls_time "${@}"; } -sh_a__ls_time() { - sh_a__ls \ +lt() { sa__ls_time "${@}"; } +sa__ls_time() { + sa__ls \ --time-style "+%Y%m%d-%H%M%S%-:::z" \ "${@}" } # list timestamps recent last -ltr() { sh_a__ls_time_reverse "${@}"; } -sh_a__ls_time_reverse() { - sh_a__ls_time \ +ltr() { sa__ls_time_reverse "${@}"; } +sa__ls_time_reverse() { + sa__ls_time \ --reverse \ -t \ "${@}" diff --git a/sh/alias/lsblk.sh b/sh/alias/lsblk.sh index 86e91be..359f5ae 100644 --- a/sh/alias/lsblk.sh +++ b/sh/alias/lsblk.sh @@ -1,7 +1,7 @@ # list block devices -lb() { sh_a__list_block "${@}"; } -sh_a__list_block() { - sh_a__list_block_output \ +lb() { sa__list_block "${@}"; } +sa__list_block() { + sa__list_block_output \ "SIZE" \ "TYPE" \ "FSTYPE" \ @@ -11,21 +11,21 @@ sh_a__list_block() { } # base arguments -lbne() { sh_a__list_block_no_empty "${@}"; } -sh_a__list_block_no_empty() { +lbne() { sa__list_block_no_empty "${@}"; } +sa__list_block_no_empty() { lsblk \ --noempty \ "${@}" } # output arguments -lbo() { sh_a__list_block_output "${@}"; } -sh_a__list_block_output() { +lbo() { sa__list_block_output "${@}"; } +sa__list_block_output() { local argument local arguments="NAME" for argument in "${@}"; do arguments="${arguments},${argument}" done - sh_a__list_block_no_empty \ + sa__list_block_no_empty \ --output "${arguments}" } diff --git a/sh/alias/mkdir.sh b/sh/alias/mkdir.sh index ae8ac4b..b8821a5 100644 --- a/sh/alias/mkdir.sh +++ b/sh/alias/mkdir.sh @@ -1,13 +1,13 @@ # make a directory -md() { sh_a__make_directory "${@}"; } -sh_a__make_directory() { +md() { sa__make_directory "${@}"; } +sa__make_directory() { mkdir \ "${@}" } # make a directory after making its parents -mdp() { sh_a__make_directory_parents "${@}"; } -sh_a__make_directory_parents() { +mdp() { sa__make_directory_parents "${@}"; } +sa__make_directory_parents() { mkdir \ --parents \ "${@}" diff --git a/sh/alias/mount.sh b/sh/alias/mount.sh index 9aa0aad..b5329a9 100644 --- a/sh/alias/mount.sh +++ b/sh/alias/mount.sh @@ -1,5 +1,5 @@ -m() { sh_a__mount "${@}"; } -sh_a__mount() { +m() { sa__mount "${@}"; } +sa__mount() { mount \ "${@}" } diff --git a/sh/alias/mv.sh b/sh/alias/mv.sh index 2a4ae5e..8f8bffd 100644 --- a/sh/alias/mv.sh +++ b/sh/alias/mv.sh @@ -1,6 +1,6 @@ # move interactively -mvi() { sh_a__mo_ve_interactive "${@}"; } -sh_a__mo_ve_interactive() { +mvi() { sa__mo_ve_interactive "${@}"; } +sa__mo_ve_interactive() { mv \ --interactive \ "${@}" diff --git a/sh/alias/nano.sh b/sh/alias/nano.sh index ca6eb65..b7cad2c 100644 --- a/sh/alias/nano.sh +++ b/sh/alias/nano.sh @@ -1,5 +1,5 @@ -nn() { sh_a__na_no "${@}"; } -sh_a__na_no() { +nn() { sa__na_no "${@}"; } +sa__na_no() { nano \ "${@}" } diff --git a/sh/alias/newsboat.sh b/sh/alias/newsboat.sh index 18c09e3..e061d63 100644 --- a/sh/alias/newsboat.sh +++ b/sh/alias/newsboat.sh @@ -1,5 +1,5 @@ -nb() { sh_a__news_boat "${@}"; } -sh_a__news_boat() { +nb() { sa__news_boat "${@}"; } +sa__news_boat() { newsboat \ "${@}" } diff --git a/sh/alias/pass.sh b/sh/alias/pass.sh index e94898a..6e3a4da 100644 --- a/sh/alias/pass.sh +++ b/sh/alias/pass.sh @@ -1,13 +1,13 @@ # display pass entry’s content -p() { sh_a__pass "${@}"; } -sh_a__pass() { +p() { sa__pass "${@}"; } +sa__pass() { pass \ "${@}" } # copy passphrase into clipboard -pc() { sh_a__pass_clip "${@}"; } -sh_a__pass_clip() { +pc() { sa__pass_clip "${@}"; } +sa__pass_clip() { pass \ --clip \ "${@}" diff --git a/sh/alias/pgrep.sh b/sh/alias/pgrep.sh index a17c888..9350d6e 100644 --- a/sh/alias/pgrep.sh +++ b/sh/alias/pgrep.sh @@ -1,6 +1,6 @@ # look for a string in processes names -pg() { sh_a__proc_grep "${@}"; } -sh_a__proc_grep() { +pg() { sa__proc_grep "${@}"; } +sa__proc_grep() { pgrep \ --list-full \ "${@}" diff --git a/sh/alias/pwgen.sh b/sh/alias/pwgen.sh index 4c0b1f2..a2cfcc7 100644 --- a/sh/alias/pwgen.sh +++ b/sh/alias/pwgen.sh @@ -1,6 +1,6 @@ # generate passwords -pwg() { sh_a__pass_word_gen "${@}"; } -sh_a__pass_word_gen() { +pwg() { sa__pass_word_gen "${@}"; } +sa__pass_word_gen() { pwgen \ -1 \ --num-passwords 1048576 \ @@ -9,9 +9,9 @@ sh_a__pass_word_gen() { } # generate passwords with symbols -pwgs() { sh_a__pass_word_gen_symbols "${@}"; } -sh_a__pass_word_gen_symbols() { - sh_a__pass_word_gen \ +pwgs() { sa__pass_word_gen_symbols "${@}"; } +sa__pass_word_gen_symbols() { + sa__pass_word_gen \ --symbols \ "${@}" } diff --git a/sh/alias/rm.sh b/sh/alias/rm.sh index f944698..ca6bd11 100644 --- a/sh/alias/rm.sh +++ b/sh/alias/rm.sh @@ -1,6 +1,6 @@ # remove interactively -rmi() { sh_a__re_move_interactive "${@}"; } -sh_a__re_move_interactive() { +rmi() { sa__re_move_interactive "${@}"; } +sa__re_move_interactive() { rm \ --interactive \ "${@}" diff --git a/sh/alias/rsync.sh b/sh/alias/rsync.sh index 02ea400..773d317 100644 --- a/sh/alias/rsync.sh +++ b/sh/alias/rsync.sh @@ -1,6 +1,6 @@ # synchronize -rs() { sh_a__r_sync "${@}"; } -sh_a__r_sync() { +rs() { sa__r_sync "${@}"; } +sa__r_sync() { rsync \ --archive \ --no-inc-recursive \ @@ -11,17 +11,17 @@ sh_a__r_sync() { } # synchronize and delete after -rsda() { sh_a__r_sync_delete_after "${@}"; } -sh_a__r_sync_delete_after() { - sh_a__r_sync \ +rsda() { sa__r_sync_delete_after "${@}"; } +sa__r_sync_delete_after() { + sa__r_sync \ --delete-after \ "${@}" } # synchronize and delete before -rsdb() { sh_a__r_sync_delete_before "${@}"; } -sh_a__r_sync_delete_before() { - sh_a__r_sync \ +rsdb() { sa__r_sync_delete_before "${@}"; } +sa__r_sync_delete_before() { + sa__r_sync \ --delete-before \ "${@}" } diff --git a/sh/alias/tar.sh b/sh/alias/tar.sh index 6da0d03..6cebb0d 100644 --- a/sh/alias/tar.sh +++ b/sh/alias/tar.sh @@ -1,30 +1,30 @@ -tc() { sh_a__tar_create "${@}"; } -sh_a__tar_create() { - sh_a__tar_verbose \ +tc() { sa__tar_create "${@}"; } +sa__tar_create() { + sa__tar_verbose \ --create \ --auto-compress \ --file \ "${@}" } -tl() { sh_a__tar_list "${@}"; } -sh_a__tar_list() { - sh_a__tar_verbose \ +tl() { sa__tar_list "${@}"; } +sa__tar_list() { + sa__tar_verbose \ --list \ --file \ "${@}" } -tv() { sh_a__tar_verbose "${@}"; } -sh_a__tar_verbose() { +tv() { sa__tar_verbose "${@}"; } +sa__tar_verbose() { tar \ --verbose \ "${@}" } -tx() { sh_a__tar_xtract "${@}"; } -sh_a__tar_xtract() { - sh_a__tar_verbose \ +tx() { sa__tar_xtract "${@}"; } +sa__tar_xtract() { + sa__tar_verbose \ --extract \ --file \ "${@}" diff --git a/sh/alias/tmux.sh b/sh/alias/tmux.sh index fa51bd5..57d6053 100644 --- a/sh/alias/tmux.sh +++ b/sh/alias/tmux.sh @@ -1,5 +1,5 @@ -tm() { sh_a__t_mux "${@}"; } -sh_a__t_mux() { +tm() { sa__t_mux "${@}"; } +sa__t_mux() { tmux \ "${@}" } diff --git a/sh/alias/tree.sh b/sh/alias/tree.sh index 9d807c0..d172896 100644 --- a/sh/alias/tree.sh +++ b/sh/alias/tree.sh @@ -1,11 +1,11 @@ -t() { sh_a__tree "${@}"; } -sh_a__tree() { +t() { sa__tree "${@}"; } +sa__tree() { tree \ "${@}" } -ta() { sh_a__tree_all "${@}"; } -sh_a__tree_all() { +ta() { sa__tree_all "${@}"; } +sa__tree_all() { tree \ -a \ "${@}"