# HG changeset patch # User Franz Glasner # Date 1725115578 -7200 # Node ID e51440a07a9d2dbce4ce5981ffe6b565463b65d8 # Parent d1ffc844ceb49d2e3433305f0816bb9fce71ed59 array.sh: Replace the __UNSET__ tag with a GUID just created diff -r d1ffc844ceb4 -r e51440a07a9d share/local-bsdtools/array.sh --- a/share/local-bsdtools/array.sh Sat Aug 31 14:07:28 2024 +0200 +++ b/share/local-bsdtools/array.sh Sat Aug 31 16:46:18 2024 +0200 @@ -33,7 +33,8 @@ #: -_farr_global_prefix="_farr_" +_farr_global_prefix=_farr_ +_farr_unset=__UNSET_d646c21167a611efa78174d435fd3892__ #: @@ -72,9 +73,9 @@ shift # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} + eval _l=\${${_gvrname}__:-${_farr_unset}} - [ "${_l}" != "__UNSET__" ] && _array_fatal "array \`${_name}' already exists" + [ "${_l}" != ${_farr_unset} ] && _array_fatal "array \`${_name}' already exists" # Really create eval ${_gvrname}__=0 @@ -123,9 +124,9 @@ _gvrname=${_farr_global_prefix}$1 # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} + eval _l=\${${_gvrname}__:-${_farr_unset}} - if [ "${_l}" = "__UNSET__" ]; then + if [ "${_l}" = ${_farr_unset} ]; then printf "%s" "-1" else printf "%s" "${_l}" @@ -152,8 +153,8 @@ _value="${2-}" # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then _array_fatal "array \`${_name}' does not exist" fi @@ -187,8 +188,8 @@ _index=$2 # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then _array_fatal "array \`${_name}' does not exist" fi @@ -232,8 +233,8 @@ _index=$2 # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then _array_fatal "array \`${_name}' does not exist" fi @@ -264,8 +265,8 @@ _gvrname=${_farr_global_prefix}$1 # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then _array_fatal "array \`${_name}' does not exist" fi @@ -300,8 +301,8 @@ _gvrname=${_farr_global_prefix}$1 # Handle non-existing array names - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then return 1 fi _idx=1 @@ -347,8 +348,8 @@ _cb="$2" # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then _array_fatal "array \`${_name}' does not exist" fi @@ -379,8 +380,8 @@ _cb="$2" # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then _array_fatal "array \`${_name}' does not exist" fi @@ -414,8 +415,8 @@ _gvrname=${_farr_global_prefix}$1 # Check whether the variable already exists - eval _l=\${${_gvrname}__:-__UNSET__} - if [ "${_l}" = "__UNSET__" ]; then + eval _l=\${${_gvrname}__:-${_farr_unset}} + if [ "${_l}" = ${_farr_unset} ]; then echo "DEBUG: array \`${_name}' does not exist" 1>&2 return 0 fi