From d5fa65132df9f20a3cbfb6422d483f96ccf15f4b Mon Sep 17 00:00:00 2001 From: Ethan P Date: Thu, 30 Apr 2020 22:11:36 -0700 Subject: [PATCH] lib: Remove opt_hooks.sh and edit scripts to source lib files directly --- lib/opt_hooks.sh | 10 ---------- src/batdiff.sh | 4 +++- src/batgrep.sh | 4 +++- src/batman.sh | 3 ++- src/batwatch.sh | 4 +++- 5 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 lib/opt_hooks.sh diff --git a/lib/opt_hooks.sh b/lib/opt_hooks.sh deleted file mode 100644 index 932b042..0000000 --- a/lib/opt_hooks.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# ----------------------------------------------------------------------------- -# bat-extras | Copyright (C) 2019 eth-p | MIT License -# -# Repository: https://github.com/eth-p/bat-extras -# Issues: https://github.com/eth-p/bat-extras/issues -# ----------------------------------------------------------------------------- -source "${LIB}/opt_hook_color.sh" -source "${LIB}/opt_hook_pager.sh" -source "${LIB}/opt_hook_version.sh" diff --git a/src/batdiff.sh b/src/batdiff.sh index b5ef2de..5163b9a 100755 --- a/src/batdiff.sh +++ b/src/batdiff.sh @@ -11,7 +11,9 @@ source "${LIB}/constants.sh" source "${LIB}/print.sh" source "${LIB}/pager.sh" source "${LIB}/opt.sh" -source "${LIB}/opt_hooks.sh" +source "${LIB}/opt_hook_color.sh" +source "${LIB}/opt_hook_pager.sh" +source "${LIB}/opt_hook_version.sh" source "${LIB}/opt_hook_width.sh" source "${LIB}/version.sh" # ----------------------------------------------------------------------------- diff --git a/src/batgrep.sh b/src/batgrep.sh index a033348..9ba10ff 100755 --- a/src/batgrep.sh +++ b/src/batgrep.sh @@ -11,7 +11,9 @@ source "${LIB}/constants.sh" source "${LIB}/print.sh" source "${LIB}/pager.sh" source "${LIB}/opt.sh" -source "${LIB}/opt_hooks.sh" +source "${LIB}/opt_hook_color.sh" +source "${LIB}/opt_hook_pager.sh" +source "${LIB}/opt_hook_version.sh" source "${LIB}/opt_hook_width.sh" source "${LIB}/version.sh" # ----------------------------------------------------------------------------- diff --git a/src/batman.sh b/src/batman.sh index 48dc410..b23bd0d 100755 --- a/src/batman.sh +++ b/src/batman.sh @@ -12,7 +12,8 @@ source "${LIB}/constants.sh" source "${LIB}/pager.sh" source "${LIB}/print.sh" source "${LIB}/opt.sh" -source "${LIB}/opt_hooks.sh" +source "${LIB}/opt_hook_color.sh" +source "${LIB}/opt_hook_version.sh" # ----------------------------------------------------------------------------- hook_color hook_version diff --git a/src/batwatch.sh b/src/batwatch.sh index 50bfc7b..7d7abc4 100755 --- a/src/batwatch.sh +++ b/src/batwatch.sh @@ -9,7 +9,9 @@ LIB="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo ".")")/../lib" && pwd)" source "${LIB}/constants.sh" source "${LIB}/opt.sh" -source "${LIB}/opt_hooks.sh" +source "${LIB}/opt_hook_color.sh" +source "${LIB}/opt_hook_pager.sh" +source "${LIB}/opt_hook_version.sh" source "${LIB}/opt_hook_width.sh" source "${LIB}/print.sh" source "${LIB}/pager.sh"