github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 04:50:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved key=value assigment

Browse source
This commit is contained in:
Serghey Rodin 2011-12-15 17:52:11 +02:00
commit 8183c1f781
13 changed files with 26 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/v_list_db_base
View file

@ -29,9 +29,7 @@ json_list_db() {
echo '{' echo '{'
# Parsing key=value # Parsing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Starting output loop # Starting output loop
for field in $fields; do for field in $fields; do
@ -70,9 +68,7 @@ shell_list_db() {
line=$(grep "DB='$database'" $conf) line=$(grep "DB='$database'" $conf)
# Parsing key=value # Parsing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
for field in $fields; do for field in $fields; do

8
bin/v_list_db_host
View file

@ -30,9 +30,7 @@ json_list_dbhost() {
echo '{' echo '{'
# Assign key=value # Assign key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Starting output loop # Starting output loop
for field in $fields; do for field in $fields; do
@ -68,9 +66,7 @@ shell_list_dbhost() {
line=$(grep "HOST='$host'" $conf) line=$(grep "HOST='$host'" $conf)
# Parsing key=value # Parsing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
for field in $fields; do for field in $fields; do

8
bin/v_list_dns_domain
View file

@ -29,9 +29,7 @@ json_list_dns() {
IFS=$'\n' IFS=$'\n'
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -86,9 +84,7 @@ shell_list_dns() {
# New delimeter # New delimeter
IFS=$'\n' IFS=$'\n'
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result # Print result
eval echo "$fields" | sed -e "s/%quote%/'/g" eval echo "$fields" | sed -e "s/%quote%/'/g"

10
bin/v_list_dns_template
View file

@ -42,9 +42,7 @@ json_list_dns() {
IFS=$'\n' IFS=$'\n'
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -96,12 +94,8 @@ shell_list_dns() {
# Reading file line by line # Reading file line by line
while read line ; do while read line ; do
# New delimeter
IFS=$'\n'
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result # Print result
eval echo "$fields" | sed -e "s/%quote%/'/g" eval echo "$fields" | sed -e "s/%quote%/'/g"

10
bin/v_list_sys_cron
View file

@ -27,9 +27,7 @@ json_list_cron() {
IFS=$'\n' IFS=$'\n'
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -81,12 +79,8 @@ shell_list_cron() {
# Reading file line by line # Reading file line by line
while read line ; do while read line ; do
# New delimeter
IFS=$'\n'
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result # Print result
eval echo "$fields" | sed -e "s/%quote%/'/g" eval echo "$fields" | sed -e "s/%quote%/'/g"

8
bin/v_list_sys_ip
View file

@ -25,9 +25,7 @@ json_list_ip() {
echo '{' echo '{'
# Assign key=value # Assign key=value
for key in $ip_data; do eval $ip_data
eval ${key%%=*}=${key#*=}
done
for field in $fields; do for field in $fields; do
eval value=$field eval value=$field
@ -59,9 +57,7 @@ shell_list_ip() {
line=$(cat $V_IPS/$IP) line=$(cat $V_IPS/$IP)
# Assing key=value # Assing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
for field in $fields; do for field in $fields; do

8
bin/v_list_sys_ips
View file

@ -26,9 +26,7 @@ json_list_ips() {
for IP in $ip_list; do for IP in $ip_list; do
# Assing key=value # Assing key=value
ip_data=$(cat $V_IPS/$IP) ip_data=$(cat $V_IPS/$IP)
for key in $ip_data; do eval $ip_data
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -83,9 +81,7 @@ shell_list_ips() {
ip_data=$(cat $V_IPS/$IP) ip_data=$(cat $V_IPS/$IP)
# Assign key/value config # Assign key/value config
for key in $ip_data; do eval $ip_data
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
eval echo "$fields" eval echo "$fields"

8
bin/v_list_sys_user
View file

@ -24,9 +24,7 @@ json_list_user() {
echo '{' echo '{'
# Assing key=value # Assing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Starting output loop # Starting output loop
for field in $fields; do for field in $fields; do
@ -60,9 +58,7 @@ shell_list_user() {
line=$(cat $V_USERS/$USER/user.conf) line=$(cat $V_USERS/$USER/user.conf)
# Parsing key=value # Parsing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
for field in $fields; do for field in $fields; do

8
bin/v_list_sys_user_ips
View file

@ -32,9 +32,7 @@ json_list_user_ips() {
ip_data=$(cat $V_IPS/$IP) ip_data=$(cat $V_IPS/$IP)
# Assing key=value # Assing key=value
for key in $ip_data; do eval $ip_data
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -93,9 +91,7 @@ shell_list_user_ips() {
ip_data=$(cat $V_IPS/$IP) ip_data=$(cat $V_IPS/$IP)
# Assign key/value config # Assign key/value config
for key in $ip_data; do eval $ip_data
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
eval echo "$fields" eval echo "$fields"

8
bin/v_list_sys_user_packages
View file

@ -24,9 +24,7 @@ json_list_pkgs() {
PACKAGE=${package/.pkg/} PACKAGE=${package/.pkg/}
# Assing key=value # Assing key=value
pkg_data=$(cat $V_DATA/packages/$package) pkg_data=$(cat $V_DATA/packages/$package)
for key in $pkg_data; do eval $pkg_data
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -69,9 +67,7 @@ shell_list_pkgs() {
PACKAGE=${package/.pkg/} PACKAGE=${package/.pkg/}
# Assign key=value # Assign key=value
pkg_descr=$(cat $V_DATA/packages/$package) pkg_descr=$(cat $V_DATA/packages/$package)
for key in $pkg_descr; do eval $pkg_descr
eval ${key%%=*}=${key#*=}
done
if [ -z "$nohead" ]; then if [ -z "$nohead" ]; then

8
bin/v_list_sys_users
View file

@ -23,9 +23,7 @@ json_list_users() {
user_data=$(cat $V_USERS/$USER/user.conf) user_data=$(cat $V_USERS/$USER/user.conf)
# Assign key/value config # Assign key/value config
for key in $user_data; do eval $user_data
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -76,9 +74,7 @@ shell_list_users() {
user_data=$(cat $V_USERS/$USER/user.conf) user_data=$(cat $V_USERS/$USER/user.conf)
# Assign key/value config # Assign key/value config
for key in $user_data; do eval $user_data
eval ${key%%=*}=${key#*=}
done
eval echo "$fields" eval echo "$fields"
done done

8
bin/v_list_web_domain
View file

@ -25,9 +25,7 @@ json_list_domain() {
echo '{' echo '{'
# Assing key=value # Assing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Starting output loop # Starting output loop
for field in $fields; do for field in $fields; do
@ -61,9 +59,7 @@ shell_list_domain() {
line=$(grep "DOMAIN='$domain'" $conf) line=$(grep "DOMAIN='$domain'" $conf)
# Parsing key=value # Parsing key=value
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result line # Print result line
for field in $fields; do for field in $fields; do

8
func/shared.func
View file

@ -907,9 +907,7 @@ json_list() {
while read line; do while read line; do
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Closing bracket if there already was output # Closing bracket if there already was output
if [ -n "$data" ]; then if [ -n "$data" ]; then
@ -960,9 +958,7 @@ shell_list() {
# Reading file line by line # Reading file line by line
while read line ; do while read line ; do
# Assing key=value pair # Assing key=value pair
for key in $line; do eval $line
eval ${key%%=*}=${key#*=}
done
# Print result # Print result
eval echo "$fields" eval echo "$fields"