mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-14 02:28:03 -07:00
improved key=value assigment
This commit is contained in:
parent
5ab11ebc68
commit
8183c1f781
13 changed files with 26 additions and 82 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue