Skip to content

Commit 8183c1f

Browse files
serghey-rodinserghey-rodin
committed
improved key=value assigment
1 parent 5ab11eb commit 8183c1f

13 files changed

+26
-82
lines changed

‎bin/v_list_db_base‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ json_list_db() {
2929
echo '{'
3030

3131
# Parsing key=value
32-
for key in $line; do
33-
eval ${key%%=*}=${key#*=}
34-
done
32+
eval $line
3533

3634
# Starting output loop
3735
for field in $fields; do
@@ -70,9 +68,7 @@ shell_list_db() {
7068
line=$(grep "DB='$database'" $conf)
7169

7270
# Parsing key=value
73-
for key in $line; do
74-
eval ${key%%=*}=${key#*=}
75-
done
71+
eval $line
7672

7773
# Print result line
7874
for field in $fields; do

‎bin/v_list_db_host‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ json_list_dbhost() {
3030
echo '{'
3131

3232
# Assign key=value
33-
for key in $line; do
34-
eval ${key%%=*}=${key#*=}
35-
done
33+
eval $line
3634

3735
# Starting output loop
3836
for field in $fields; do
@@ -68,9 +66,7 @@ shell_list_dbhost() {
6866
line=$(grep "HOST='$host'" $conf)
6967

7068
# Parsing key=value
71-
for key in $line; do
72-
eval ${key%%=*}=${key#*=}
73-
done
69+
eval $line
7470

7571
# Print result line
7672
for field in $fields; do

‎bin/v_list_dns_domain‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ json_list_dns() {
2929
IFS=$'\n'
3030

3131
# Assing key=value pair
32-
for key in $line; do
33-
eval ${key%%=*}=${key#*=}
34-
done
32+
eval $line
3533

3634
# Closing bracket if there already was output
3735
if [ -n "$data" ]; then
@@ -86,9 +84,7 @@ shell_list_dns() {
8684
# New delimeter
8785
IFS=$'\n'
8886
# Assing key=value pair
89-
for key in $line; do
90-
eval ${key%%=*}=${key#*=}
91-
done
87+
eval $line
9288

9389
# Print result
9490
eval echo "$fields" | sed -e "s/%quote%/'/g"

‎bin/v_list_dns_template‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ json_list_dns() {
4242
IFS=$'\n'
4343

4444
# Assing key=value pair
45-
for key in $line; do
46-
eval ${key%%=*}=${key#*=}
47-
done
45+
eval $line
4846

4947
# Closing bracket if there already was output
5048
if [ -n "$data" ]; then
@@ -96,12 +94,8 @@ shell_list_dns() {
9694

9795
# Reading file line by line
9896
while read line ; do
99-
# New delimeter
100-
IFS=$'\n'
10197
# Assing key=value pair
102-
for key in $line; do
103-
eval ${key%%=*}=${key#*=}
104-
done
98+
eval $line
10599

106100
# Print result
107101
eval echo "$fields" | sed -e "s/%quote%/'/g"

‎bin/v_list_sys_cron‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ json_list_cron() {
2727
IFS=$'\n'
2828

2929
# Assing key=value pair
30-
for key in $line; do
31-
eval ${key%%=*}=${key#*=}
32-
done
30+
eval $line
3331

3432
# Closing bracket if there already was output
3533
if [ -n "$data" ]; then
@@ -81,12 +79,8 @@ shell_list_cron() {
8179

8280
# Reading file line by line
8381
while read line ; do
84-
# New delimeter
85-
IFS=$'\n'
8682
# Assing key=value pair
87-
for key in $line; do
88-
eval ${key%%=*}=${key#*=}
89-
done
83+
eval $line
9084

9185
# Print result
9286
eval echo "$fields" | sed -e "s/%quote%/'/g"

‎bin/v_list_sys_ip‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ json_list_ip() {
2525
echo '{'
2626

2727
# Assign key=value
28-
for key in $ip_data; do
29-
eval ${key%%=*}=${key#*=}
30-
done
28+
eval $ip_data
3129

3230
for field in $fields; do
3331
eval value=$field
@@ -59,9 +57,7 @@ shell_list_ip() {
5957
line=$(cat $V_IPS/$IP)
6058

6159
# Assing key=value
62-
for key in $line; do
63-
eval ${key%%=*}=${key#*=}
64-
done
60+
eval $line
6561

6662
# Print result line
6763
for field in $fields; do

‎bin/v_list_sys_ips‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ json_list_ips() {
2626
for IP in $ip_list; do
2727
# Assing key=value
2828
ip_data=$(cat $V_IPS/$IP)
29-
for key in $ip_data; do
30-
eval ${key%%=*}=${key#*=}
31-
done
29+
eval $ip_data
3230

3331
# Closing bracket if there already was output
3432
if [ -n "$data" ]; then
@@ -83,9 +81,7 @@ shell_list_ips() {
8381
ip_data=$(cat $V_IPS/$IP)
8482

8583
# Assign key/value config
86-
for key in $ip_data; do
87-
eval ${key%%=*}=${key#*=}
88-
done
84+
eval $ip_data
8985

9086
# Print result line
9187
eval echo "$fields"

‎bin/v_list_sys_user‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ json_list_user() {
2424
echo '{'
2525

2626
# Assing key=value
27-
for key in $line; do
28-
eval ${key%%=*}=${key#*=}
29-
done
27+
eval $line
3028

3129
# Starting output loop
3230
for field in $fields; do
@@ -60,9 +58,7 @@ shell_list_user() {
6058
line=$(cat $V_USERS/$USER/user.conf)
6159

6260
# Parsing key=value
63-
for key in $line; do
64-
eval ${key%%=*}=${key#*=}
65-
done
61+
eval $line
6662

6763
# Print result line
6864
for field in $fields; do

‎bin/v_list_sys_user_ips‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ json_list_user_ips() {
3232
ip_data=$(cat $V_IPS/$IP)
3333

3434
# Assing key=value
35-
for key in $ip_data; do
36-
eval ${key%%=*}=${key#*=}
37-
done
35+
eval $ip_data
3836

3937
# Closing bracket if there already was output
4038
if [ -n "$data" ]; then
@@ -93,9 +91,7 @@ shell_list_user_ips() {
9391
ip_data=$(cat $V_IPS/$IP)
9492

9593
# Assign key/value config
96-
for key in $ip_data; do
97-
eval ${key%%=*}=${key#*=}
98-
done
94+
eval $ip_data
9995

10096
# Print result line
10197
eval echo "$fields"

‎bin/v_list_sys_user_packages‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ json_list_pkgs() {
2424
PACKAGE=${package/.pkg/}
2525
# Assing key=value
2626
pkg_data=$(cat $V_DATA/packages/$package)
27-
for key in $pkg_data; do
28-
eval ${key%%=*}=${key#*=}
29-
done
27+
eval $pkg_data
3028

3129
# Closing bracket if there already was output
3230
if [ -n "$data" ]; then
@@ -69,9 +67,7 @@ shell_list_pkgs() {
6967
PACKAGE=${package/.pkg/}
7068
# Assign key=value
7169
pkg_descr=$(cat $V_DATA/packages/$package)
72-
for key in $pkg_descr; do
73-
eval ${key%%=*}=${key#*=}
74-
done
70+
eval $pkg_descr
7571

7672

7773
if [ -z "$nohead" ]; then

0 commit comments

Comments
 (0)