refactor(Bash): abstract now() function

johnnymillergh · Oct 26, 2020 · c7e2c2a · c7e2c2a
1 parent b6bd88d
commit c7e2c2a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/.travis/common.sh b/.travis/common.sh
@@ -5,19 +5,24 @@
 # https://misc.flogisoft.com/bash/tip_colors_and_formatting
 # Pass arguments into a function
 # https://bash.cyberciti.biz/guide/Pass_arguments_into_a_function
+function now() {
+  nowVariable=$(date +%Y-%m-%d' '%H:%M:%S.%N | cut -b 1-23)
+  echo "$nowVariable"
+}
+
 function printInfo() {
-  echo -e "$NOW \e[32m INFO --- $1\e[0m"
+  echo -e "$(now) \e[32m INFO --- $1\e[0m"
   return 0
 }
 
 function printWarn() {
-  echo -e "$NOW \e[33m WARN --- $1\e[0m"
+  echo -e "$(now) \e[33m WARN --- $1\e[0m"
   return 0
 }
 
 function printError() {
-  echo -e "$NOW \e[31mERROR --- $1\e[0m"
+  echo -e "$(now) \e[31mERROR --- $1\e[0m"
   return 0
 }
 
-export -f printInfo
+export -f printInfo printWarn printError
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
@@ -11,24 +11,28 @@
 # https://stackoverflow.com/questions/19622198/what-does-set-e-mean-in-a-bash-script
 set -e
 
-NOW=$(date +%Y-%m-%d' '%H:%M:%S.%N | cut -b 1-23)
-
+########################## Functions Declaration ##########################
 # Bash tips: Colors and formatting (ANSI/VT100 Control sequences)
 # https://misc.flogisoft.com/bash/tip_colors_and_formatting
 # Pass arguments into a function
 # https://bash.cyberciti.biz/guide/Pass_arguments_into_a_function
+function now() {
+  nowVariable=$(date +%Y-%m-%d' '%H:%M:%S.%N | cut -b 1-23)
+  echo "$nowVariable"
+}
+
 function printInfo() {
-  echo -e "$NOW \e[32m INFO --- $1\e[0m"
+  echo -e "$(now) \e[32m INFO --- $1\e[0m"
   return 0
 }
 
 function printWarn() {
-  echo -e "$NOW \e[33m WARN --- $1\e[0m"
+  echo -e "$(now) \e[33m WARN --- $1\e[0m"
   return 0
 }
 
 function printError() {
-  echo -e "$NOW \e[31mERROR --- $1\e[0m"
+  echo -e "$(now) \e[31mERROR --- $1\e[0m"
   return 0
 }
 

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -11,18 +11,23 @@ NOW=$(date +%Y-%m-%d' '%H:%M:%S.%N | cut -b 1-23)
 # https://misc.flogisoft.com/bash/tip_colors_and_formatting
 # Pass arguments into a function
 # https://bash.cyberciti.biz/guide/Pass_arguments_into_a_function
+function now() {
+  nowVariable=$(date +%Y-%m-%d' '%H:%M:%S.%N | cut -b 1-23)
+  echo "$nowVariable"
+}
+
 function printInfo() {
-  echo -e "$NOW \e[32m INFO --- $1\e[0m"
+  echo -e "$(now) \e[32m INFO --- $1\e[0m"
   return 0
 }
 
 function printWarn() {
-  echo -e "$NOW \e[33m WARN --- $1\e[0m"
+  echo -e "$(now) \e[33m WARN --- $1\e[0m"
   return 0
 }
 
 function printError() {
-  echo -e "$NOW \e[31mERROR --- $1\e[0m"
+  echo -e "$(now) \e[31mERROR --- $1\e[0m"
   return 0
 }