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,13 +16,13 @@ format=${1-shell}
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
# Json function
json_list_wtpl() {
t_counter=$(echo "$templates" | wc -w)
# JSON list function
json_list() {
objects=$(echo "$templates" |wc -w)
i=1
echo '['
for template in $templates; do
if [ "$i" -lt "$t_counter" ]; then
if [ "$i" -lt "$objects" ]; then
echo -e "\t\"$template\","
else
echo -e "\t\"$template\""
@ -30,14 +30,27 @@ json_list_wtpl() {
(( ++i))
done
echo "]"
}
}
# Shell function
shell_list_wtpl() {
if [ -z "$nohead" ]; then
echo "Templates"
echo "----------"
fi
# SHELL list function
shell_list() {
echo "TEMPLATE"
echo "--------"
for template in $templates; do
echo "$template"
done
}
# PLAIN list function
plain_list() {
for template in $templates; do
echo "$template"
done
}
# CSV list function
csv_list() {
echo "TEMPLATE"
for template in $templates; do
echo "$template"
done
@ -48,21 +61,20 @@ shell_list_wtpl() {
# Action #
#----------------------------------------------------------#
# Proxy templates
if [ -z "$PROXY_SYSTEM" ]; then
exit
# Parsing proxy templates
if [ ! -z "$PROXY_SYSTEM" ]; then
templates=$(ls -t $WEBTPL/$PROXY_SYSTEM |\
cut -f1 -d . |\
grep -v proxy_ip |\
sort -u )
fi
templates=$(ls -t $WEBTPL/$PROXY_SYSTEM |\
cut -f1 -d . |\
grep -v proxy_ip |\
sort -u )
# Listing domains
# Listing data
case $format in
json) json_list_wtpl ;;
plain) nohead=1; shell_list_wtpl ;;
shell) shell_list_wtpl ;;
*) check_args '1' '0' '[FORMAT]'
json) json_list ;;
plain) plain_list ;;
csv) csv_list ;;
shell) shell_list ;;
esac