From 8183c1f7818a603be1449bd4736f5ae55cf8dd0c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 15 Dec 2011 17:52:11 +0200 Subject: [PATCH] improved key=value assigment --- bin/v_list_db_base | 8 ++------ bin/v_list_db_host | 8 ++------ bin/v_list_dns_domain | 8 ++------ bin/v_list_dns_template | 10 ++-------- bin/v_list_sys_cron | 10 ++-------- bin/v_list_sys_ip | 8 ++------ bin/v_list_sys_ips | 8 ++------ bin/v_list_sys_user | 8 ++------ bin/v_list_sys_user_ips | 8 ++------ bin/v_list_sys_user_packages | 8 ++------ bin/v_list_sys_users | 8 ++------ bin/v_list_web_domain | 8 ++------ func/shared.func | 8 ++------ 13 files changed, 26 insertions(+), 82 deletions(-) diff --git a/bin/v_list_db_base b/bin/v_list_db_base index 9102ea46..79e15a62 100755 --- a/bin/v_list_db_base +++ b/bin/v_list_db_base @@ -29,9 +29,7 @@ json_list_db() { echo '{' # Parsing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Starting output loop for field in $fields; do @@ -70,9 +68,7 @@ shell_list_db() { line=$(grep "DB='$database'" $conf) # Parsing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result line for field in $fields; do diff --git a/bin/v_list_db_host b/bin/v_list_db_host index f1e50fb6..9e8aee1e 100755 --- a/bin/v_list_db_host +++ b/bin/v_list_db_host @@ -30,9 +30,7 @@ json_list_dbhost() { echo '{' # Assign key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Starting output loop for field in $fields; do @@ -68,9 +66,7 @@ shell_list_dbhost() { line=$(grep "HOST='$host'" $conf) # Parsing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result line for field in $fields; do diff --git a/bin/v_list_dns_domain b/bin/v_list_dns_domain index a087b196..94293bec 100755 --- a/bin/v_list_dns_domain +++ b/bin/v_list_dns_domain @@ -29,9 +29,7 @@ json_list_dns() { IFS=$'\n' # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Closing bracket if there already was output if [ -n "$data" ]; then @@ -86,9 +84,7 @@ shell_list_dns() { # New delimeter IFS=$'\n' # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result eval echo "$fields" | sed -e "s/%quote%/'/g" diff --git a/bin/v_list_dns_template b/bin/v_list_dns_template index 4bb18ff0..2cec9c65 100755 --- a/bin/v_list_dns_template +++ b/bin/v_list_dns_template @@ -42,9 +42,7 @@ json_list_dns() { IFS=$'\n' # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Closing bracket if there already was output if [ -n "$data" ]; then @@ -96,12 +94,8 @@ shell_list_dns() { # Reading file line by line while read line ; do - # New delimeter - IFS=$'\n' # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result eval echo "$fields" | sed -e "s/%quote%/'/g" diff --git a/bin/v_list_sys_cron b/bin/v_list_sys_cron index 486e01d4..525fc197 100755 --- a/bin/v_list_sys_cron +++ b/bin/v_list_sys_cron @@ -27,9 +27,7 @@ json_list_cron() { IFS=$'\n' # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Closing bracket if there already was output if [ -n "$data" ]; then @@ -81,12 +79,8 @@ shell_list_cron() { # Reading file line by line while read line ; do - # New delimeter - IFS=$'\n' # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result eval echo "$fields" | sed -e "s/%quote%/'/g" diff --git a/bin/v_list_sys_ip b/bin/v_list_sys_ip index 610460ab..6cfa1bc6 100755 --- a/bin/v_list_sys_ip +++ b/bin/v_list_sys_ip @@ -25,9 +25,7 @@ json_list_ip() { echo '{' # Assign key=value - for key in $ip_data; do - eval ${key%%=*}=${key#*=} - done + eval $ip_data for field in $fields; do eval value=$field @@ -59,9 +57,7 @@ shell_list_ip() { line=$(cat $V_IPS/$IP) # Assing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result line for field in $fields; do diff --git a/bin/v_list_sys_ips b/bin/v_list_sys_ips index b73b4e85..f98831d2 100755 --- a/bin/v_list_sys_ips +++ b/bin/v_list_sys_ips @@ -26,9 +26,7 @@ json_list_ips() { for IP in $ip_list; do # Assing key=value ip_data=$(cat $V_IPS/$IP) - for key in $ip_data; do - eval ${key%%=*}=${key#*=} - done + eval $ip_data # Closing bracket if there already was output if [ -n "$data" ]; then @@ -83,9 +81,7 @@ shell_list_ips() { ip_data=$(cat $V_IPS/$IP) # Assign key/value config - for key in $ip_data; do - eval ${key%%=*}=${key#*=} - done + eval $ip_data # Print result line eval echo "$fields" diff --git a/bin/v_list_sys_user b/bin/v_list_sys_user index 583bcdc1..18917afa 100755 --- a/bin/v_list_sys_user +++ b/bin/v_list_sys_user @@ -24,9 +24,7 @@ json_list_user() { echo '{' # Assing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Starting output loop for field in $fields; do @@ -60,9 +58,7 @@ shell_list_user() { line=$(cat $V_USERS/$USER/user.conf) # Parsing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result line for field in $fields; do diff --git a/bin/v_list_sys_user_ips b/bin/v_list_sys_user_ips index 891aae0a..c4428eff 100755 --- a/bin/v_list_sys_user_ips +++ b/bin/v_list_sys_user_ips @@ -32,9 +32,7 @@ json_list_user_ips() { ip_data=$(cat $V_IPS/$IP) # Assing key=value - for key in $ip_data; do - eval ${key%%=*}=${key#*=} - done + eval $ip_data # Closing bracket if there already was output if [ -n "$data" ]; then @@ -93,9 +91,7 @@ shell_list_user_ips() { ip_data=$(cat $V_IPS/$IP) # Assign key/value config - for key in $ip_data; do - eval ${key%%=*}=${key#*=} - done + eval $ip_data # Print result line eval echo "$fields" diff --git a/bin/v_list_sys_user_packages b/bin/v_list_sys_user_packages index 2d70af14..2941a383 100755 --- a/bin/v_list_sys_user_packages +++ b/bin/v_list_sys_user_packages @@ -24,9 +24,7 @@ json_list_pkgs() { PACKAGE=${package/.pkg/} # Assing key=value pkg_data=$(cat $V_DATA/packages/$package) - for key in $pkg_data; do - eval ${key%%=*}=${key#*=} - done + eval $pkg_data # Closing bracket if there already was output if [ -n "$data" ]; then @@ -69,9 +67,7 @@ shell_list_pkgs() { PACKAGE=${package/.pkg/} # Assign key=value pkg_descr=$(cat $V_DATA/packages/$package) - for key in $pkg_descr; do - eval ${key%%=*}=${key#*=} - done + eval $pkg_descr if [ -z "$nohead" ]; then diff --git a/bin/v_list_sys_users b/bin/v_list_sys_users index 3a75f448..5b497808 100755 --- a/bin/v_list_sys_users +++ b/bin/v_list_sys_users @@ -23,9 +23,7 @@ json_list_users() { user_data=$(cat $V_USERS/$USER/user.conf) # Assign key/value config - for key in $user_data; do - eval ${key%%=*}=${key#*=} - done + eval $user_data # Closing bracket if there already was output if [ -n "$data" ]; then @@ -76,9 +74,7 @@ shell_list_users() { user_data=$(cat $V_USERS/$USER/user.conf) # Assign key/value config - for key in $user_data; do - eval ${key%%=*}=${key#*=} - done + eval $user_data eval echo "$fields" done diff --git a/bin/v_list_web_domain b/bin/v_list_web_domain index e749a27e..44d63a49 100755 --- a/bin/v_list_web_domain +++ b/bin/v_list_web_domain @@ -25,9 +25,7 @@ json_list_domain() { echo '{' # Assing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Starting output loop for field in $fields; do @@ -61,9 +59,7 @@ shell_list_domain() { line=$(grep "DOMAIN='$domain'" $conf) # Parsing key=value - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result line for field in $fields; do diff --git a/func/shared.func b/func/shared.func index 3f109d21..6435f919 100644 --- a/func/shared.func +++ b/func/shared.func @@ -907,9 +907,7 @@ json_list() { while read line; do # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Closing bracket if there already was output if [ -n "$data" ]; then @@ -960,9 +958,7 @@ shell_list() { # Reading file line by line while read line ; do # Assing key=value pair - for key in $line; do - eval ${key%%=*}=${key#*=} - done + eval $line # Print result eval echo "$fields"