From a29a2606d9a227dda006b2df94fbcc6549dd0dae Mon Sep 17 00:00:00 2001 From: a5ob7r <12132068+a5ob7r@users.noreply.github.com> Date: Mon, 18 Oct 2021 15:29:47 +0900 Subject: [PATCH 1/3] [refector] use builtin echo instead of cat Remove extra dependency. But maybe cat is installed in almost environments... --- fzpac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fzpac b/fzpac index ca9cd0d..9228d7b 100755 --- a/fzpac +++ b/fzpac @@ -19,7 +19,7 @@ _version() { readonly LICENSE="MIT" readonly GITHUB_URL="https://github.com" - cat <${STYLE_RESET} show information of the package ${STYLE_UNDERBAR}${STYLE_RESET} select a package ${STYLE_UNDERBAR}${STYLE_RESET} confirm selection -EOF +" } _main() { From 8c1cbe564324f4cefb77226b15ace3d4cd8051b5 Mon Sep 17 00:00:00 2001 From: a5ob7r <12132068+a5ob7r@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:54:08 +0900 Subject: [PATCH 2/3] [refector] use builtin type instead of which --- fzpac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fzpac b/fzpac index 9228d7b..24ba842 100755 --- a/fzpac +++ b/fzpac @@ -3,7 +3,7 @@ set -o errexit set -o nounset -SHELL="$(which bash)" +SHELL="$(type -P bash)" readonly SHELL readonly THIS_CMD="${0##*/}" From 28e85955c9f3878da5a98a7b19b95229c62c0222 Mon Sep 17 00:00:00 2001 From: a5ob7r <12132068+a5ob7r@users.noreply.github.com> Date: Fri, 22 Oct 2021 22:01:49 +0900 Subject: [PATCH 3/3] [refactor] remove env It is redundant because Bash does the same thing at command invocation. --- fzpac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fzpac b/fzpac index 24ba842..73da0b9 100755 --- a/fzpac +++ b/fzpac @@ -216,7 +216,7 @@ _fuzzyfinder() { done fi - env LANG=C "${finder}" "${args[@]}" + LANG=C "${finder}" "${args[@]}" } _err() { @@ -282,9 +282,9 @@ _show_info() { local pkg="${2}" shift 1 - env LANG=C "${pac}" --sync --search --color=always "^${pkg}$" + LANG=C "${pac}" --sync --search --color=always "^${pkg}$" echo "" - env LANG=C "${pac}" --sync --info --color=always "${pkg}" + LANG=C "${pac}" --sync --info --color=always "${pkg}" } _show_info_local() { @@ -292,9 +292,9 @@ _show_info_local() { local pkg="${2}" shift 1 - env LANG=C "${pac}" --query --search --color=always "^${pkg}$" + LANG=C "${pac}" --query --search --color=always "^${pkg}$" echo "" - env LANG=C "${pac}" --query --info --list --color=always "${pkg}" + LANG=C "${pac}" --query --info --list --color=always "${pkg}" } _install() {