Browse Source

Remove unnecessary resetting of IFS

pull/6241/head
Jacobo de Vera 2 months ago
committed by tomo
parent
commit
2ba4a1b659
No known key found for this signature in database GPG Key ID: 6826163BFB606E85
  1. 7
      deploy/multideploy.sh

7
deploy/multideploy.sh

@ -58,7 +58,6 @@ multideploy_deploy() {
_debug2 "MULTIDEPLOY_FILENAME" "$MULTIDEPLOY_FILENAME" _debug2 "MULTIDEPLOY_FILENAME" "$MULTIDEPLOY_FILENAME"
fi fi
OLDIFS=$IFS
if ! file=$(_preprocess_deployfile "$MULTIDEPLOY_FILENAME"); then if ! file=$(_preprocess_deployfile "$MULTIDEPLOY_FILENAME"); then
_err "Failed to preprocess deploy file." _err "Failed to preprocess deploy file."
return 1 return 1
@ -92,7 +91,6 @@ _preprocess_deployfile() {
_debug3 "yq is installed." _debug3 "yq is installed."
# Check if deploy file exists # Check if deploy file exists
IFS=$(printf '\n')
for file in "$@"; do for file in "$@"; do
_debug3 "Checking file" "$DOMAIN_PATH/$file" _debug3 "Checking file" "$DOMAIN_PATH/$file"
if [ -f "$DOMAIN_PATH/$file" ]; then if [ -f "$DOMAIN_PATH/$file" ]; then
@ -106,7 +104,6 @@ _preprocess_deployfile() {
_debug3 "File not found" _debug3 "File not found"
fi fi
done done
IFS=$OLDIFS
if [ -z "$found_file" ]; if [ -z "$found_file" ];
then then
@ -190,14 +187,12 @@ _export_envs() {
_secure_debug3 "Exporting envs" "$_env_list" _secure_debug3 "Exporting envs" "$_env_list"
IFS=$(printf '\n')
echo "$_env_list" | yq e -r 'to_entries | .[] | .key + "=" + .value' | while IFS='=' read -r _key _value; do echo "$_env_list" | yq e -r 'to_entries | .[] | .key + "=" + .value' | while IFS='=' read -r _key _value; do
# Using eval to expand nested variables in the configuration file # Using eval to expand nested variables in the configuration file
_value=$(eval echo "$_value") _value=$(eval echo "$_value")
_savedeployconf "$_key" "$_value" _savedeployconf "$_key" "$_value"
_secure_debug3 "Saved $_key" "$_value" _secure_debug3 "Saved $_key" "$_value"
done done
IFS=$OLDIFS
} }
# Description: # Description:
@ -221,13 +216,11 @@ _clear_envs() {
_secure_debug3 "Clearing envs" "$_env_list" _secure_debug3 "Clearing envs" "$_env_list"
env_pairs=$(echo "$_env_list" | yq e -r 'to_entries | .[] | .key + "=" + .value') env_pairs=$(echo "$_env_list" | yq e -r 'to_entries | .[] | .key + "=" + .value')
IFS=$(printf '\n')
echo "$env_pairs" | while IFS='=' read -r _key _value; do echo "$env_pairs" | while IFS='=' read -r _key _value; do
_debug3 "Deleting key" "$_key" _debug3 "Deleting key" "$_key"
_cleardomainconf "SAVED_$_key" _cleardomainconf "SAVED_$_key"
unset -v "$_key" unset -v "$_key"
done done
IFS="$OLDIFS"
} }
# Description: # Description:

Loading…
Cancel
Save