yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-04-30 07:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed IFS problems

Browse Source
This commit is contained in:
tomo 2025-02-21 18:23:29 +01:00
parent ccd9d9a79e
commit 8d77bef828
No known key found for this signature in database
GPG Key ID: 5FB8BCB7CE54EE44
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deploy/multideploy.sh
View File

@ -66,6 +66,7 @@ _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
@ -79,6 +80,7 @@ _preprocess_deployfile() {
_debug3 "File not found" _debug3 "File not found"
fi fi
done done
IFS=$OLDIFS
if [ -n "$found_file" ]; then if [ -n "$found_file" ]; then
_check_deployfile "$DOMAIN_PATH/$found_file" "$MULTIDEPLOY_CONFIG" _check_deployfile "$DOMAIN_PATH/$found_file" "$MULTIDEPLOY_CONFIG"
@ -124,6 +126,7 @@ _check_deployfile() {
fi fi
_debug2 "Config has services." _debug2 "Config has services."
IFS=$(printf '\n')
# Check if extracted services exist in services list # Check if extracted services exist in services list
for _service in $_services; do for _service in $_services; do
_debug2 "Checking service" "$_service" _debug2 "Checking service" "$_service"
@ -145,6 +148,7 @@ _check_deployfile() {
return 1 return 1
fi fi
done done
IFS=$OLDIFS
} }
# deploy_filepath deploy_config # deploy_filepath deploy_config
@ -166,25 +170,27 @@ _export_envs() {
_secure_debug3 "Exporting envs" "$_env_list" _secure_debug3 "Exporting envs" "$_env_list"
for _env in $_env_list; do IFS=$(printf '\n')
_key=$(echo "$_env" | cut -d '=' -f1) echo "$_env_list" | yq e -r 'to_entries | .[] | .key + "=" + .value' | while IFS='=' read -r _key _value; do
_value=$(echo "$_env" | cut -d '=' -f2-)
_savedomainconf "$_key" "$_value" _savedomainconf "$_key" "$_value"
_secure_debug3 "Saved $_key" "$_value" _secure_debug3 "Saved $_key" "$_value"
done done
IFS=$OLDIFS
} }
_clear_envs() { _clear_envs() {
_env_list="$1" _env_list="$1"
_secure_debug3 "Clearing envs" "$_env_list" _secure_debug3 "Clearing envs" "$_env_list"
env_pairs=$(echo "$_env_list" | yq e -r 'to_entries | .[] | .key + "=" + .value')
for _env in $_env_list; do IFS=$(printf '\n')
_key=$(echo "$_env" | cut -d '=' -f1) 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 "$_key" unset "$_key"
done done
IFS="$OLDIFS"
} }
# deploy_filepath services_array # deploy_filepath services_array
@ -196,14 +202,17 @@ _deploy_services() {
_debug3 "Deploy file" "$_deploy_file" _debug3 "Deploy file" "$_deploy_file"
_debug3 "Services" "$_services" _debug3 "Services" "$_services"
IFS=$(printf '\n')
for _service in $_services; do for _service in $_services; do
_debug2 "Service" "$_service" _debug2 "Service" "$_service"
_hook=$(yq e ".services[] | select(.name == \"$_service\").hook" "$_deploy_file") _hook=$(yq e ".services[] | select(.name == \"$_service\").hook" "$_deploy_file")
_envs=$(yq e ".services[] | select(.name == \"$_service\").environment[]" "$_deploy_file") _envs=$(yq e ".services[] | select(.name == \"$_service\").environment[]" "$_deploy_file")
_export_envs "$_envs" _export_envs "$_envs"
_deploy_service "$_service" "$_hook" _deploy_service "$_service" "$_hook"
_clear_envs "$_envs" _clear_envs "$_envs"
done done
IFS=$OLDIFS
} }
_deploy_service() { _deploy_service() {