listing scripts refactoring + new format

This commit is contained in:
Serghey Rodin 2016-06-09 16:26:54 +03:00
commit 6e0ef668bb
60 changed files with 3695 additions and 1991 deletions

View file

@ -16,30 +16,41 @@ format=${2-shell}
# Includes
source $VESTA/func/main.sh
# Json function
json_list_ns() {
ns=$(grep "^NS='" $USER_DATA/user.conf |cut -f 2 -d \')
echo '['
# JSON list function
json_list() {
i=1
nslistc=$(echo -e "${ns//,/\\n}"|wc -l)
objects=$(echo -e "${ns//,/\\n}" |wc -l)
echo '['
for nameserver in ${ns//,/ };do
if [ "$i" -ne "$nslistc" ]; then
if [ "$i" -ne "$objects" ]; then
echo -e "\t\"$nameserver\","
else
echo -e "\t\"$nameserver\""
fi
(( ++i))
done
echo "]"
echo ']'
}
# Shell function
shell_list_ns() {
ns=$(grep "^NS='" $USER_DATA/user.conf |cut -f 2 -d \')
if [ -z "$nohead" ]; then
echo "NAMESERVER"
echo "----------"
fi
# SHELL list function
shell_list() {
echo "NS"
echo "--"
for nameserver in ${ns//,/ };do
echo "$nameserver"
done
}
# PLAIN list function
plain_list() {
for nameserver in ${ns//,/ };do
echo "$nameserver"
done
}
# CSV list function
csv_list() {
echo "NAMESERVER"
for nameserver in ${ns//,/ };do
echo "$nameserver"
done
@ -51,7 +62,7 @@ shell_list_ns() {
#----------------------------------------------------------#
check_args '1' "$#" 'USER [FORMAT]'
validate_format 'user'
is_format_valid 'user'
is_object_valid 'user' 'USER' "$user"
@ -59,12 +70,15 @@ is_object_valid 'user' 'USER' "$user"
# Action #
#----------------------------------------------------------#
# Listing nameservers
case $format in
json) json_list_ns ;;
plain) nohead=1; shell_list_ns ;;
shell) shell_list_ns ;;
*) check_args '1' '0' 'USER [FORMAT]'
# Parsing name servers
ns=$(grep "^NS='" $USER_DATA/user.conf |cut -f 2 -d \')
# Listing data
case $format in
json) json_list ;;
plain) plain_list ;;
csv) csv_list ;;
shell) shell_list ;;
esac