diff --git a/themes/gradient.sh b/themes/gradient.sh index 14dea7b..12d5361 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_${i^^}_BG=${gradient[$j]} - eval WISH_${i^^}_FG=${fg_gradient[$j]} + declare WISH_${i^^}_BG=${gradient[$j]} + declare WISH_${i^^}_FG=${fg_gradient[$j]} ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 @@ -18,8 +18,8 @@ j=0 for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do i=${WISH_RIGHT_PLUGINS[$idx]} [[ $i =~ newline$ ]] && j=0 && continue - eval WISH_${i^^}_BG=${gradient[$j]} - eval WISH_${i^^}_FG=${fg_gradient[$j]} + declare WISH_${i^^}_BG=${gradient[$j]} + declare WISH_${i^^}_FG=${fg_gradient[$j]} ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 diff --git a/themes/icy_candy.sh b/themes/icy_candy.sh index 49db655..44e5aaf 100644 --- a/themes/icy_candy.sh +++ b/themes/icy_candy.sh @@ -8,8 +8,8 @@ function wish_icy_candy_theme { local j=0 for i in "${WISH_PLUGINS[@]}"; do [[ $i =~ newline$ ]] && j=0 && continue - eval "WISH_${i^^}_FG=${fg_gradient[$j]}" - eval "WISH_${i^^}_BG=${l_gradient[$j]}" + declare "WISH_${i^^}_FG=${fg_gradient[$j]}" + declare "WISH_${i^^}_BG=${l_gradient[$j]}" ((j++)) if [[ $j -eq ${#l_gradient[@]} ]]; then j=0 @@ -20,8 +20,8 @@ function wish_icy_candy_theme { for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do i=${WISH_RIGHT_PLUGINS[$idx]} [[ $i =~ newline$ ]] && j=0 && continue - eval "WISH_${i^^}_BG=${r_gradient[$j]}" - eval "WISH_${i^^}_FG=${fg_gradient[$j]}" + declare "WISH_${i^^}_BG=${r_gradient[$j]}" + declare "WISH_${i^^}_FG=${fg_gradient[$j]}" ((j++)) if [[ $j -eq ${#r_gradient[@]} ]]; then j=0 diff --git a/themes/lowfi-neon.sh b/themes/lowfi-neon.sh index a6aabd6..7b3ee9f 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_${i^^}_BG=-1 - eval WISH_${i^^}_FG=${gradient[$j]} + declare WISH_${i^^}_BG=-1 + declare WISH_${i^^}_FG=${gradient[$j]} ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 @@ -18,8 +18,8 @@ j=0 for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do i=${WISH_RIGHT_PLUGINS[$idx]} [[ $i =~ newline$ ]] && j=0 && continue - eval WISH_${i^^}_BG=-1 - eval WISH_${i^^}_FG=${gradient[$j]} + declare WISH_${i^^}_BG=-1 + declare WISH_${i^^}_FG=${gradient[$j]} ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 diff --git a/themes/luminus.sh b/themes/luminus.sh index 2621e0d..561dc38 100644 --- a/themes/luminus.sh +++ b/themes/luminus.sh @@ -7,8 +7,8 @@ function wish_luminous_theme { local j=0 for i in "${WISH_PLUGINS[@]}"; do [[ $i =~ newline$ ]] && j=0 && continue - eval "WISH_${i^^}_FG=${fg_gradient[$j]}" - eval "WISH_${i^^}_BG=${gradient[$j]}" + declare "WISH_${i^^}_FG=${fg_gradient[$j]}" + declare "WISH_${i^^}_BG=${gradient[$j]}" ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 @@ -19,8 +19,8 @@ function wish_luminous_theme { for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do i=${WISH_RIGHT_PLUGINS[$idx]} [[ $i =~ newline$ ]] && j=0 && continue - eval "WISH_${i^^}_BG=${gradient[$j]}" - eval "WISH_${i^^}_FG=${fg_gradient[$j]}" + declare "WISH_${i^^}_BG=${gradient[$j]}" + declare "WISH_${i^^}_FG=${fg_gradient[$j]}" ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 diff --git a/themes/plain.sh b/themes/plain.sh index ffef741..0b04cf4 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[@]} ${WISH_RIGHT_PLUGINS[@]}; do - eval WISH_${i^^}_BG=-1 - eval WISH_${i^^}_FG=-1 + declare WISH_${i^^}_BG=-1 + declare WISH_${i^^}_FG=-1 done diff --git a/themes/rgb_gradient.sh b/themes/rgb_gradient.sh index ffadde2..e244c7b 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_${i^^}_BG=${gradient[$j]} - eval WISH_${i^^}_FG=${fg_gradient[$j]} + declare WISH_${i^^}_BG=${gradient[$j]} + declare WISH_${i^^}_FG=${fg_gradient[$j]} ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0 @@ -18,8 +18,8 @@ j=0 for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do i=${WISH_RIGHT_PLUGINS[$idx]} [[ $i =~ newline$ ]] && j=0 && continue - eval WISH_${i^^}_BG=${gradient[$j]} - eval WISH_${i^^}_FG=${fg_gradient[$j]} + declare WISH_${i^^}_BG=${gradient[$j]} + declare WISH_${i^^}_FG=${fg_gradient[$j]} ((j++)) if [[ $j -eq ${#gradient[@]} ]]; then j=0