changeset 755:f6d296c5868e

farray.sh: Optimize farray_sort(): use setvar instead of eval where possible. While there use [...] || [...] instead of [ ... -o ... ] there.
author Franz Glasner <fzglas.hg@dom66.de>
date Fri, 18 Oct 2024 14:02:18 +0200
parents 1f3a789ef3ab
children 33df05108ba1
files share/local-bsdtools/farray.sh
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/share/local-bsdtools/farray.sh	Wed Oct 16 23:58:16 2024 +0200
+++ b/share/local-bsdtools/farray.sh	Fri Oct 18 14:02:18 2024 +0200
@@ -1435,12 +1435,12 @@
         else
             eval __farr_val=\"\$\{${__farr_gvrname}_${__farr_pos}\}\"
             eval __farr_val_1=\"\$\{${__farr_gvrname}_$((__farr_pos - 1))\}\"
-            if [ \( "${__farr_val}" '>' "${__farr_val_1}" \) -o \( "${__farr_val}" '=' "${__farr_val_1}" \) ] ; then
+            if [ "${__farr_val}" '>' "${__farr_val_1}" ] || [ "${__farr_val}" '=' "${__farr_val_1}" ] ; then
                 __farr_pos=$((__farr_pos + 1))
             else
                 # swap
-                eval ${__farr_gvrname}_${__farr_pos}=\"\$\{__farr_val_1\}\"
-                eval ${__farr_gvrname}_$((__farr_pos - 1))=\"\$\{__farr_val\}\"
+                setvar "${__farr_gvrname}_${__farr_pos}" "${__farr_val_1}"
+                setvar "${__farr_gvrname}_$((__farr_pos - 1))" "${__farr_val}"
                 __farr_pos=$((__farr_pos - 1))
             fi
         fi