dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

stdenv: refactor appendToVar and prependToVar

Browse Source 
No need to call declare -p twice. The case statement is easier to read
than the multi-if.
This commit is contained in:
Wolfgang Walther 2024-06-09 14:05:47 +02:00
parent 5488d279d5
commit cdb2f2971c
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/stdenv/generic/setup.sh
View File

@ -280,16 +280,16 @@ prependToVar() {
fi
# check if variable already exist and if it does then do extra checks
if declare -p "$1" 2> /dev/null | grep -q '^'; then
type="$(declare -p "$1")"
if [[ "$type" =~ "declare -A" ]]; then
echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." >&2
return 1
elif [[ "$type" =~ "declare -a" ]]; then
useArray=true
else
useArray=false
fi
if type=$(declare -p "$1" 2> /dev/null); then
case "${type#* }" in
-A*)
echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." >&2
return 1 ;;
-a*)
useArray=true ;;
*)
useArray=false ;;
esac
fi
shift
@ -313,16 +313,16 @@ appendToVar() {
fi
# check if variable already exist and if it does then do extra checks
if declare -p "$1" 2> /dev/null | grep -q '^'; then
type="$(declare -p "$1")"
if [[ "$type" =~ "declare -A" ]]; then
echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." >&2
return 1
elif [[ "$type" =~ "declare -a" ]]; then
useArray=true
else
useArray=false
fi
if type=$(declare -p "$1" 2> /dev/null); then
case "${type#* }" in
-A*)
echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." >&2
return 1 ;;
-a*)
useArray=true ;;
*)
useArray=false ;;
esac
fi
shift