# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1729252938 -7200
# Node ID f6d296c5868e1a781f9032bf10ce1363b1cf1d3e
# Parent  1f3a789ef3abce10300f8fc5e3201e5cc7c2e3c5
farray.sh: Optimize farray_sort(): use setvar instead of eval where possible.

While there use [...] || [...] instead of [ ... -o ... ] there.

diff -r 1f3a789ef3ab -r f6d296c5868e share/local-bsdtools/farray.sh
--- 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