From 4bed328fa24884bb19b8e7948bd545bf60d93a27 Mon Sep 17 00:00:00 2001
From: Ceda EI <ceda_ei@webionite.com>
Date: Fri, 6 Sep 2019 22:24:35 +0530
Subject: [PATCH] Replace tr with parameter expansion.

---
 themes/gradient.sh     | 4 ++--
 themes/lowfi-neon.sh   | 4 ++--
 themes/plain.sh        | 4 ++--
 themes/rgb_gradient.sh | 4 ++--
 wish.sh                | 9 +++------
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/themes/gradient.sh b/themes/gradient.sh
index e77f42b..b6d9e67 100644
--- a/themes/gradient.sh
+++ b/themes/gradient.sh
@@ -6,8 +6,8 @@ local fg_gradient=(16 16 16 16 16 15 15)
 local j=0
 for i in ${WISH_PLUGINS[@]}; do
 	[[ $i == "newline" ]] && j=0 && continue
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_BG=${gradient[$j]}
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_FG=${fg_gradient[$j]}
+	eval WISH_${i^^}_BG=${gradient[$j]}
+	eval WISH_${i^^}_FG=${fg_gradient[$j]}
 	((j++))
 	if [[ $j -eq ${#gradient[@]} ]]; then
 		j=0
diff --git a/themes/lowfi-neon.sh b/themes/lowfi-neon.sh
index 3770eb8..5041ea0 100644
--- a/themes/lowfi-neon.sh
+++ b/themes/lowfi-neon.sh
@@ -6,8 +6,8 @@ local gradient=(e7c547 c0e551 82e35a 62e177 6bdfb3 73d4dd 7aa6da)
 local j=0
 for i in ${WISH_PLUGINS[@]}; do
 	[[ $i == "newline" ]] && j=0 && continue
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_BG=-1
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_FG=${gradient[$j]}
+	eval WISH_${i^^}_BG=-1
+	eval WISH_${i^^}_FG=${gradient[$j]}
 	((j++))
 	if [[ $j -eq ${#gradient[@]} ]]; then
 		j=0
diff --git a/themes/plain.sh b/themes/plain.sh
index a0dad45..e89e2d1 100644
--- a/themes/plain.sh
+++ b/themes/plain.sh
@@ -2,6 +2,6 @@ WISH_DEFAULT_BG=-1
 WISH_DEFAULT_FG=-1
 WISH_POWERLINE=0
 for i in ${WISH_PLUGINS[@]}; do
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_BG=-1
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_FG=-1
+	eval WISH_${i^^}_BG=-1
+	eval WISH_${i^^}_FG=-1
 done
diff --git a/themes/rgb_gradient.sh b/themes/rgb_gradient.sh
index 9aa9797..cb54307 100644
--- a/themes/rgb_gradient.sh
+++ b/themes/rgb_gradient.sh
@@ -6,8 +6,8 @@ local fg_gradient=(000000 000000 000000 000000 000000 ffffff ffffff)
 local j=0
 for i in ${WISH_PLUGINS[@]}; do
 	[[ $i == "newline" ]] && j=0 && continue
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_BG=${gradient[$j]}
-	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_FG=${fg_gradient[$j]}
+	eval WISH_${i^^}_BG=${gradient[$j]}
+	eval WISH_${i^^}_FG=${fg_gradient[$j]}
 	((j++))
 	if [[ $j -eq ${#gradient[@]} ]]; then
 		j=0
diff --git a/wish.sh b/wish.sh
index 6f976fc..e2c435c 100644
--- a/wish.sh
+++ b/wish.sh
@@ -101,16 +101,13 @@ function wish_main() {
 					if wish_${WISH_PLUGINS[$(($i + 1))]}_start $prev; then
 						local plugin=${WISH_PLUGINS[$i]}
 						local next_plugin=${WISH_PLUGINS[$(($i+1))]}
-						local fg_name=$(echo WISH_$(echo $plugin |
-							tr '[:lower:]' '[:upper:]')_BG)
-						local bg_name=$(echo WISH_$(echo $next_plugin |
-							tr '[:lower:]' '[:upper:]')_BG)
+						local fg_name="WISH_${plugin^^}_BG"
+						local bg_name="WISH_${next_plugin^^}_BG"
 						wish_append ${!bg_name} ${!fg_name} 
 					fi
 				else
 					local plugin=${WISH_PLUGINS[$i]}
-					local fg_name=$(echo WISH_$(echo $plugin |
-						tr '[:lower:]' '[:upper:]')_BG)
+					local fg_name="WISH_${plugin^^}_BG"
 					wish_append -1 ${!fg_name} 
 				fi
 			fi