mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-19 21:04:06 -07:00
Improved eval key=value parsing
This commit is contained in:
parent
7bf46685a0
commit
fa8cada5c5
1 changed files with 12 additions and 34 deletions
|
@ -159,9 +159,7 @@ update_domain_zone() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parsing dns domains conf
|
# Parsing dns domains conf
|
||||||
for key in $line; do
|
eval $line
|
||||||
eval ${key%%=*}=${key#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Converting SOA to ascii
|
# Converting SOA to ascii
|
||||||
SOA=$(idn --quiet -a -t "$SOA")
|
SOA=$(idn --quiet -a -t "$SOA")
|
||||||
|
@ -326,9 +324,7 @@ get_web_domain_value() {
|
||||||
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
|
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
|
||||||
|
|
||||||
# Parsing key=value
|
# Parsing key=value
|
||||||
for keys in $string; do
|
eval $string
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Self reference
|
# Self reference
|
||||||
eval value="$key"
|
eval value="$key"
|
||||||
|
@ -341,9 +337,7 @@ get_web_domain_values() {
|
||||||
# Defining domain parameters
|
# Defining domain parameters
|
||||||
for line in $(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf); do
|
for line in $(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf); do
|
||||||
# Assing key=value
|
# Assing key=value
|
||||||
for key in $line; do
|
eval $line
|
||||||
eval ${key%%=*}=${key#*=}
|
|
||||||
done
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -354,9 +348,7 @@ get_dns_domain_value() {
|
||||||
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/dns.conf )
|
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/dns.conf )
|
||||||
|
|
||||||
# Parsing key=value
|
# Parsing key=value
|
||||||
for keys in $string; do
|
eval $string
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Self reference
|
# Self reference
|
||||||
eval value="$key"
|
eval value="$key"
|
||||||
|
@ -378,9 +370,7 @@ update_web_domain_value() {
|
||||||
str=$(echo $domain_str | cut -f 2 -d ':')
|
str=$(echo $domain_str | cut -f 2 -d ':')
|
||||||
|
|
||||||
# Reading key=values
|
# Reading key=values
|
||||||
for keys in $str; do
|
eval $str
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Defining clean key
|
# Defining clean key
|
||||||
c_key=$(echo "${key//$/}")
|
c_key=$(echo "${key//$/}")
|
||||||
|
@ -409,9 +399,7 @@ update_dns_domain_value() {
|
||||||
str=$(echo $domain_str | cut -f 2 -d ':')
|
str=$(echo $domain_str | cut -f 2 -d ':')
|
||||||
|
|
||||||
# Reading key=values
|
# Reading key=values
|
||||||
for keys in $str; do
|
eval $str
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Defining clean key
|
# Defining clean key
|
||||||
c_key=$(echo "${key//$/}")
|
c_key=$(echo "${key//$/}")
|
||||||
|
@ -434,9 +422,7 @@ is_web_domain_key_empty() {
|
||||||
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
|
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
|
||||||
|
|
||||||
# Parsing key=value
|
# Parsing key=value
|
||||||
for keys in $string; do
|
eval $string
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Self reference
|
# Self reference
|
||||||
eval value="$key"
|
eval value="$key"
|
||||||
|
@ -518,9 +504,7 @@ is_web_domain_value_exist() {
|
||||||
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
|
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
|
||||||
|
|
||||||
# Parsing key=value
|
# Parsing key=value
|
||||||
for keys in $string; do
|
eval $string
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Self reference
|
# Self reference
|
||||||
eval value="$key"
|
eval value="$key"
|
||||||
|
@ -540,9 +524,7 @@ is_dns_domain_value_exist() {
|
||||||
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/dns.conf )
|
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/dns.conf )
|
||||||
|
|
||||||
# Parsing key=value
|
# Parsing key=value
|
||||||
for keys in $string; do
|
eval $string
|
||||||
eval ${keys%%=*}=${keys#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Self reference
|
# Self reference
|
||||||
eval value="$key"
|
eval value="$key"
|
||||||
|
@ -599,9 +581,8 @@ dom_clear_search(){
|
||||||
# Reading file line by line
|
# Reading file line by line
|
||||||
for line in $(grep $search_string $conf); do
|
for line in $(grep $search_string $conf); do
|
||||||
# Parsing key=val
|
# Parsing key=val
|
||||||
for key in $line; do
|
eval $line
|
||||||
eval ${key%%=*}=${key#*=}
|
|
||||||
done
|
|
||||||
# Print result line
|
# Print result line
|
||||||
eval echo "$field"
|
eval echo "$field"
|
||||||
done
|
done
|
||||||
|
@ -610,11 +591,8 @@ dom_clear_search(){
|
||||||
dom_clear_list() {
|
dom_clear_list() {
|
||||||
# Reading file line by line
|
# Reading file line by line
|
||||||
while read line ; do
|
while read line ; do
|
||||||
|
|
||||||
# Parsing key=value
|
# Parsing key=value
|
||||||
for key in $line; do
|
eval $line
|
||||||
eval ${key%%=*}=${key#*=}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Print result line
|
# Print result line
|
||||||
eval echo "$field"
|
eval echo "$field"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue