Refactor: DRY

2021-10-25 22:43:46 -04:00 · 2021-10-25 22:43:46 -04:00 · d19eaeb6e9
commit d19eaeb6e9
parent 1bf05d0972
2 changed files with 5 additions and 3 deletions
--- a/6
+++ b/6
@ -43,8 +43,10 @@ DEFAULT_PRE=' '
 DEFAULT_SEP_L='| '
 DEFAULT_SEP_R=' '
 DEFAULT_SUF=' '
-MOD_DIR="$(dirname "$0")"/mod
-FIFO=/tmp/avdd-fifo-"$("$(dirname "$0")"/rpid $$)"
+DIR="$(dirname "$0")"
+MOD_DIR="${DIR}/mod"
+DAEMON="$(basename "$0")"
+FIFO="/tmp/${DAEMON}-fifo-$("${DIR}/rpid" $$)"

 mod_list="${1-${DEFAULT_MOD_LIST}}"

--- a/2
+++ b/2
@ -75,7 +75,7 @@ if [[ "${mod_list}" =~ ^\>\>\*\  ]]; then
  mod_list="${mod_list:4}"
  is_request_all=1
 else
-  fifo=/tmp/avdd-fifo-"$("$(dirname "$0")"/rpid $$)"
+  fifo="/tmp/${DAEMON}-fifo-$("$(dirname "$0")/rpid" $$)"
 fi

 when="${2:-0}"