From a1760af43b641d51ffb7ab292e721f48b5205804 Mon Sep 17 00:00:00 2001
From: Ron Green <11993626+georgettica@users.noreply.github.com>
Date: Sat, 12 Dec 2020 12:51:16 +0200
Subject: [PATCH 1/5] feat(vim-alias): add full screen help
---
aliases/available/vim.aliases.bash | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash
index 2ad1e99ce3..0aa1e43356 100644
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
@@ -5,6 +5,10 @@ VIM=$(command -v vim)
GVIM=$(command -v gvim)
MVIM=$(command -v mvim)
+# open the vim help in fullscreen incorporated from
+# https://stackoverflow.com/a/4687513
+alias vimh='${VIM} -c ":h | only"'
+
[[ -n $VIM ]] && alias v=$VIM
# open vim in new tab is taken from
From 5eb023cf51b7b41670164fe3ca6e7c4f734bf9fa Mon Sep 17 00:00:00 2001
From: Ron Green <11993626+georgettica@users.noreply.github.com>
Date: Tue, 15 Dec 2020 22:46:47 +0200
Subject: [PATCH 2/5] Update vim.aliases.bash
---
aliases/available/vim.aliases.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash
index 0aa1e43356..3904cb1c73 100644
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
@@ -7,7 +7,7 @@ MVIM=$(command -v mvim)
# open the vim help in fullscreen incorporated from
# https://stackoverflow.com/a/4687513
-alias vimh='${VIM} -c ":h | only"'
+alias vimh='${VIM} -c ":h | only"'
[[ -n $VIM ]] && alias v=$VIM
From d74cc615be958c7adf0b5ee7ac3d30bc4545c56c Mon Sep 17 00:00:00 2001
From: Ron Green <11993626+georgettica@users.noreply.github.com>
Date: Wed, 23 Dec 2020 10:19:06 +0200
Subject: [PATCH 3/5] feat(lint): lint vim.aliases
---
aliases/available/vim.aliases.bash | 14 +++++++-------
clean_files.txt | 3 +++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash
index 3904cb1c73..a573d088eb 100644
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
@@ -9,15 +9,15 @@ MVIM=$(command -v mvim)
# https://stackoverflow.com/a/4687513
alias vimh='${VIM} -c ":h | only"'
-[[ -n $VIM ]] && alias v=$VIM
+[[ -n $VIM ]] && alias v='$VIM'
# open vim in new tab is taken from
# http://stackoverflow.com/questions/936501/let-gvim-always-run-a-single-instancek
case $OSTYPE in
- darwin*)
- [[ -n $MVIM ]] && function mvimt { command mvim --remote-tab-silent "$@" || command mvim "$@"; }
- ;;
- *)
- [[ -n $GVIM ]] && function gvimt { command gvim --remote-tab-silent "$@" || command gvim "$@"; }
- ;;
+ darwin*)
+ [[ -n $MVIM ]] && function mvimt { command mvim --remote-tab-silent "$@" || command mvim "$@"; }
+ ;;
+ *)
+ [[ -n $GVIM ]] && function gvimt { command gvim --remote-tab-silent "$@" || command gvim "$@"; }
+ ;;
esac
diff --git a/clean_files.txt b/clean_files.txt
index 8c4e5926ba..464fd78f5e 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -34,3 +34,6 @@ completion/available/cargo.completion.bash
completion/available/knife.completion.bash
completion/available/pipx.completion.bash
completion/available/rustup.completion.bash
+
+# aliases
+aliases/available/vim.aliases.bash
From e94b9420acc327c07d9745f393882aa65d842c76 Mon Sep 17 00:00:00 2001
From: Ron Green <11993626+georgettica@users.noreply.github.com>
Date: Sun, 27 Dec 2020 18:05:11 +0200
Subject: [PATCH 4/5] fix(vim-aliases): make alias dependant on envvar
---
aliases/available/vim.aliases.bash | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash
index a573d088eb..f2451a9901 100644
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
@@ -5,11 +5,10 @@ VIM=$(command -v vim)
GVIM=$(command -v gvim)
MVIM=$(command -v mvim)
+[[ -n $VIM ]] && alias v='$VIM'
# open the vim help in fullscreen incorporated from
# https://stackoverflow.com/a/4687513
-alias vimh='${VIM} -c ":h | only"'
-
-[[ -n $VIM ]] && alias v='$VIM'
+[[ -n $VIM ]] && alias vimh='${VIM} -c ":h | only"'
# open vim in new tab is taken from
# http://stackoverflow.com/questions/936501/let-gvim-always-run-a-single-instancek
From d6e2b04708b4e8a04f1a8d3abd6fa014cadc312f Mon Sep 17 00:00:00 2001
From: Ron Green <11993626+georgettica@users.noreply.github.com>
Date: Mon, 28 Dec 2020 10:58:02 +0200
Subject: [PATCH 5/5] fix(vim-aliases): join '$VIM' statements
---
aliases/available/vim.aliases.bash | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash
index f2451a9901..72a378094c 100644
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
@@ -5,10 +5,12 @@ VIM=$(command -v vim)
GVIM=$(command -v gvim)
MVIM=$(command -v mvim)
-[[ -n $VIM ]] && alias v='$VIM'
-# open the vim help in fullscreen incorporated from
-# https://stackoverflow.com/a/4687513
-[[ -n $VIM ]] && alias vimh='${VIM} -c ":h | only"'
+if [[ -n $VIM ]]; then
+ alias v='$VIM'
+ # open the vim help in fullscreen incorporated from
+ # https://stackoverflow.com/a/4687513
+ alias vimh='${VIM} -c ":h | only"'
+fi
# open vim in new tab is taken from
# http://stackoverflow.com/questions/936501/let-gvim-always-run-a-single-instancek