github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 10:37:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed unnecessary sed expr defenition

Browse source
This commit is contained in:
Serghey Rodin 2013-10-27 13:54:31 +02:00
commit 861585bcca
30 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/v-add-backup-ftp-host
View file

@ -88,10 +88,10 @@ if [ -z "$(grep LANGUAGE $VESTA/conf/vesta.conf)" ]; then
echo "BACKUP_SYSTEM='ftp'" >> $VESTA/conf/vesta.conf
else
bckp=$(echo "$BACKUP_SYSTEM,ftp" |\
sed -e "s/,/\n/g"|\
sed "s/,/\n/g"|\
sort -r -u |\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $VESTA/conf/vesta.conf
fi

2
bin/v-add-cron-job
View file

@ -17,7 +17,7 @@ hour=$3
day=$4
month=$5
wday=$6
command=$(echo $7 | sed -e "s/'/%quote%/g")
command=$(echo $7 | sed "s/'/%quote%/g")
job=$8
restart=$9

8
bin/v-change-domain-owner
View file

@ -56,7 +56,7 @@ if [ ! -z "$web_data" ]; then
# Change IP
if [ ! -z "$ip" ]; then
web_data=$(echo "$web_data" | sed -e "s/IP='$IP'/IP='$ip'/")
web_data=$(echo "$web_data" | sed "s/IP='$IP'/IP='$ip'/")
fi
# Check SSL
@ -76,8 +76,8 @@ if [ ! -z "$web_data" ]; then
if [ ! -z "$FTP_USER" ]; then
/usr/sbin/userdel -f $FTP_USER >> /dev/null 2>&1
old_str="FTP_USER='$FTP_USER'"
new_str=$(echo "$old_str" | sed -e "s/${owner}_/${user}_/")
web_data=$(echo "$web_data" | sed -e "s/$old_str/$new_str/")
new_str=$(echo "$old_str" | sed "s/${owner}_/${user}_/")
web_data=$(echo "$web_data" | sed "s/$old_str/$new_str/")
fi
# Move config
@ -100,7 +100,7 @@ if [ ! -z "$dns_data" ]; then
# Change IP
if [ ! -z "$ip" ]; then
dns_data=$(echo "$dns_data" | sed -e "s/IP='$IP'/IP='$ip'/")
dns_data=$(echo "$dns_data" | sed "s/IP='$IP'/IP='$ip'/")
sed -i "s/$IP/$ip/g" $VESTA/data/users/$owner/dns/$domain.conf
fi

2
bin/v-change-user-ns
View file

@ -49,7 +49,7 @@ is_object_unsuspended 'user' 'USER' "$user"
# Merging values
ns="$ns1,$ns2,$ns3,$ns4"
ns=$(echo "$ns"|sed -e "s/,,//g" -e "s/,$//")
ns=$(echo "$ns" | sed -e "s/,,//g" -e "s/,$//")
# Changing ns values
update_user_value "$user" '$NS' "$ns"

8
bin/v-delete-backup-ftp-host
View file

@ -33,10 +33,10 @@ rm -f $VESTA/conf/ftp.backup.conf
# Update vesta.conf
bckp=$(echo "$BACKUP_SYSTEM" |\
sed -e "s/,/\n/g"|\
sed -e "s/ftp//" |\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "s/,/\n/g"|\
sed "s/ftp//" |\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $VESTA/conf/vesta.conf
# Logging

2
bin/v-delete-dns-on-web-alias
View file

@ -54,7 +54,7 @@ if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
else
# Check subdomain
sub=$(echo "$dom_alias" | cut -f1 -d . -s)
root=$(echo "$dom_alias" | sed -e "s/^$sub.//" )
root=$(echo "$dom_alias" | sed "s/^$sub.//" )
if [ -e "$USER_DATA/dns/$root.conf" ]; then
if [ "$sub" == '*' ]; then
rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$root.conf)

8
bin/v-delete-mail-account-alias
View file

@ -50,10 +50,10 @@ fi
sed -i "/^$malias@$domain:$account/d" $HOMEDIR/$user/conf/mail/$domain/aliases
aliases=$(echo "$aliases" |\
sed -e "s/,/\n/g"|\
sed -e "s/^$malias$//g"|\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "s/,/\n/g"|\
sed "s/^$malias$//g"|\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
#----------------------------------------------------------#

8
bin/v-delete-mail-account-forward
View file

@ -49,10 +49,10 @@ fi
#----------------------------------------------------------#
fwd=$(echo "$fwd" |\
sed -e "s/,/\n/g"|\
sed -e "s/^$forward$//g"|\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "s/,/\n/g"|\
sed "s/^$forward$//g"|\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases

4
bin/v-delete-sys-ip
View file

@ -81,7 +81,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
fw_conf="/etc/$WEB_SYSTEM/conf.d/mod_extract_forwarded.conf"
if [ -e "$fw_conf" ]; then
ips=$(grep 'MEFaccept 127.0.0.1' $fw_conf)
new_ips=$(echo "$ips" | sed -e "s/$ip//" )
new_ips=$(echo "$ips" | sed "s/$ip//" )
sed -i "s/$ips/$new_ips/g" $fw_conf
fi
@ -89,7 +89,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
rpaf_conf="/etc/$WEB_SYSTEM/mods-enabled/rpaf.conf"
if [ -e "$rpaf_conf" ]; then
ips=$(grep RPAFproxy_ips $rpaf_conf)
new_ips=$(echo "$rpaf_str" | sed -e "s/$ip//")
new_ips=$(echo "$rpaf_str" | sed "s/$ip//")
sed -i "s/$ips/$new_ips/g" $rpaf_conf
fi

2
bin/v-get-dns-domain-value
View file

@ -13,7 +13,7 @@
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh

2
bin/v-get-mail-account-value
View file

@ -14,7 +14,7 @@ user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
account=$3
key=$(echo "$4"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
key=$(echo "$4"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh

2
bin/v-get-mail-domain-value
View file

@ -13,7 +13,7 @@
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh

2
bin/v-get-user-value
View file

@ -11,7 +11,7 @@
# Argument defenition
user=$1
key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
key=$(echo "$2"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh

2
bin/v-get-web-domain-value
View file

@ -15,7 +15,7 @@
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh

2
bin/v-list-dns-records
View file

@ -65,7 +65,7 @@ shell_list_dns() {
while read line ; do
IFS=$'\n'
eval $line
eval echo "$fields" | sed -e "s/%quote%/'/g"
eval echo "$fields" | sed "s/%quote%/'/g"
done < $conf
}

2
bin/v-list-dns-template
View file

@ -64,7 +64,7 @@ shell_list_dns() {
while read line ; do
eval $line
eval echo "$fields" | sed -e "s/%quote%/'/g"
eval echo "$fields" | sed "s/%quote%/'/g"
done < $conf
}

2
bin/v-list-mail-account-autoreply
View file

@ -53,7 +53,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
if [ -e "$USER_DATA/mail/$account@$domain.msg" ]; then
msg=$(cat $USER_DATA/mail/$account@$domain.msg |\
sed -e ':a;N;$!ba;s/\n/\\n/g' )
sed ':a;N;$!ba;s/\n/\\n/g' )
fi
# Listing domains

4
bin/v-list-mail-domain-dkim
View file

@ -50,11 +50,11 @@ is_object_valid 'mail' 'DOMAIN' "$domain"
# Action #
#----------------------------------------------------------#
if [ -e "$USER_DATA/mail/$domain.pem" ]; then
pem=$(cat $USER_DATA/mail/$domain.pem |sed -e ':a;N;$!ba;s/\n/\\n/g')
pem=$(cat $USER_DATA/mail/$domain.pem | sed ':a;N;$!ba;s/\n/\\n/g')
fi
if [ -e "$USER_DATA/mail/$domain.pub" ]; then
pub=$(cat $USER_DATA/mail/$domain.pub |sed -e ':a;N;$!ba;s/\n/\\n/g')
pub=$(cat $USER_DATA/mail/$domain.pub | sed ':a;N;$!ba;s/\n/\\n/g')
fi
# Listing domains

6
bin/v-list-web-domain-ssl
View file

@ -54,15 +54,15 @@ is_object_valid 'web' 'DOMAIN' "$domain"
# Action #
#----------------------------------------------------------#
if [ -e "$USER_DATA/ssl/$domain.crt" ]; then
crt=$(cat $USER_DATA/ssl/$domain.crt |sed -e ':a;N;$!ba;s/\n/\\n/g' )
crt=$(cat $USER_DATA/ssl/$domain.crt | sed ':a;N;$!ba;s/\n/\\n/g' )
fi
if [ -e "$USER_DATA/ssl/$domain.key" ]; then
key=$(cat $USER_DATA/ssl/$domain.key |sed -e ':a;N;$!ba;s/\n/\\n/g' )
key=$(cat $USER_DATA/ssl/$domain.key | sed ':a;N;$!ba;s/\n/\\n/g' )
fi
if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
ca=$(cat $USER_DATA/ssl/$domain.ca |sed -e ':a;N;$!ba;s/\n/\\n/g' )
ca=$(cat $USER_DATA/ssl/$domain.ca | sed ':a;N;$!ba;s/\n/\\n/g' )
fi
# Listing domains

10
bin/v-restore-user
View file

@ -218,10 +218,10 @@ if [ "$web" != 'no' ]; then
if [ ! -z "$check_new" ]; then
# Delete conflicting alias
ALIAS=$(echo "$ALIAS" |\
sed -e "s/,/\n/g"|\
sed -e "s/^$dom_alias$//g"|\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "s/,/\n/g"|\
sed "s/^$dom_alias$//g"|\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
fi
done
@ -719,7 +719,7 @@ if [ "$udir" != 'no' ]; then
# Create user dir list
udir_list=$(tar -tf $BACKUP/$backup | grep "^./user_dir" |\
grep tar.gz | cut -f 3 -d '/' | sed -e "s/.tar.gz//")
grep tar.gz | cut -f 3 -d '/' | sed "s/.tar.gz//")
if [ ! -z "$udir" ]; then
udir_include_list=$(mktemp)

4
bin/v-search-object
View file

@ -62,7 +62,7 @@ shell_list_search() {
fi
while read line ; do
eval $line
eval echo "$fields" | sed -e "s/%quote%/'/g"
eval echo "$fields" | sed "s/%quote%/'/g"
done < $conf
}
@ -183,7 +183,7 @@ for user in $(ls $VESTA/data/users/); do
type='mail'
if [ -n "$(echo $ACCOUNT |grep $object)" ]; then
key="ACCOUNT"
dom="$(echo $row|cut -f 1 -d :|cut -f 9 -d /|sed -e "s/.conf//")"
dom="$(echo $row|cut -f 1 -d :|cut -f 9 -d /|sed 's/.conf//')"
result="$ACCOUNT@$dom"
suspended=$SUSPENDED
object_link=$ACCOUNT

4
bin/v-search-user-object
View file

@ -63,7 +63,7 @@ shell_list_search() {
fi
while read line ; do
eval $line
eval echo "$fields" | sed -e "s/%quote%/'/g"
eval echo "$fields" | sed "s/%quote%/'/g"
done < $conf
}
@ -183,7 +183,7 @@ for row in $search; do
type='mail'
if [ -n "$(echo $ACCOUNT |grep $object)" ]; then
key="ACCOUNT"
dom="$(echo $row|cut -f 1 -d :|cut -f 9 -d /|sed -e "s/.conf//")"
dom="$(echo $row|cut -f 1 -d :|cut -f 9 -d /|sed 's/.conf//')"
result="$ACCOUNT@$dom"
suspended=$SUSPENDED
object_link=$ACCOUNT

2
bin/v-update-sys-ip-counters
View file

@ -47,7 +47,7 @@ for ip in $ip_list; do
ip_usage=$(grep -H $ip $VESTA/data/users/*/web.conf)
web_domains=$(echo "$ip_usage"| wc -l)
sys_users=$(echo "$ip_usage" | cut -f7 -d/ | sort -u |\
tr '\n' ',' | sed -e "s/,$//g")
tr '\n' ',' | sed "s/,$//g")
# Update counters
update_ip_value '$U_WEB_DOMAINS' "$web_domains"

4
bin/v-update-sys-rrd-net
View file

@ -37,7 +37,7 @@ fi
# Parsing network interfaces
ndev=$(cat /proc/net/dev)
ifaces=$(echo "$ndev" |grep : |cut -f 1 -d : |sed -e "s/ //g")
ifaces=$(echo "$ndev" |grep : |cut -f 1 -d : | sed "s/ //g")
# Parsing excludes
for exclude in $(echo ${RRD_IFACE_EXCLUDE//,/ }); do
@ -63,7 +63,7 @@ for iface in $ifaces; do
# Parsing device stats
if [ "$period" = 'daily' ]; then
x=$(echo "$ndev" |sed -e "s/^ *//" |grep "^$iface:" |sed -e "s/:/ /")
x=$(echo "$ndev" |sed "s/^ *//" |grep "^$iface:" |sed "s/:/ /")
rx=$(echo "$x" |awk '{print $2}')
tx=$(echo "$x" |awk '{print $10}')

10
bin/v-update-user-backups
View file

@ -48,7 +48,7 @@ get_backup_info() {
else
i=1
for domain in $web_data; do
domain="$(basename $domain|sed -e 's/.tar.gz$//')"
domain="$(basename $domain |sed 's/.tar.gz$//')"
if [ "$i" -eq 1 ]; then
web="$domain"
i=2
@ -64,7 +64,7 @@ get_backup_info() {
else
i=1
for domain in $dns_data; do
domain="$(basename $domain|sed -e 's/.db$//')"
domain="$(basename $domain |sed 's/.db$//')"
if [ "$i" -eq 1 ]; then
dns="$domain"
i=2
@ -80,7 +80,7 @@ get_backup_info() {
else
i=1
for domain in $mail_data; do
domain="$(basename $domain|sed -e 's/.tar.gz$//')"
domain="$(basename $domain |sed 's/.tar.gz$//')"
if [ "$i" -eq 1 ]; then
ml="$domain"
i=2
@ -96,7 +96,7 @@ get_backup_info() {
else
i=1
for dbase in $db_data; do
dbase=$(basename $dbase|sed -e "s/.\(my\|pg\)sql.sql.gz$//")
dbase=$(basename $dbase |sed "s/.\(my\|pg\)sql.sql.gz$//")
if [ "$i" -eq 1 ]; then
db="$dbase"
i=2
@ -112,7 +112,7 @@ get_backup_info() {
else
i=1
for certificate in $ssl_data; do
certificate="$(basename $certificate|sed -e "s/.crt$//")"
certificate=$(basename $certificate |sed "s/.crt$//")
if [ "$i" -eq 1 ]; then
ssl="$certificate"
i=2

8
bin/v-update-web-domain-stat
View file

@ -84,16 +84,16 @@ build_awstats() {
fi
# Creating main awstats page
$awstats $opts | sed -e "s%awstats.$domain.%%g" > $dir/$month/index.html
$awstats $opts | sed "s%awstats.$domain.%%g" > $dir/$month/index.html
# Creating suplemental awstats pages
for format in $output; do
$awstats $opts=$format |\
sed -e "s%awstats.$domain.%%g" > $dir/$month/$format.html
sed "s%awstats.$domain.%%g" > $dir/$month/$format.html
done
# Creating index page
cat $WEBTPL/awstats/index.tpl | sed -e "s/%month%/$month/g" >\
cat $WEBTPL/awstats/index.tpl | sed "s/%month%/$month/g" >\
$dir/index.html
# Creating navigation page
@ -120,7 +120,7 @@ build_awstats() {
select_m="$select_m<option value=$link>$month $year<\/option>\n"
done
cat $WEBTPL/awstats/nav.tpl | sed -e "s/%select_month%/$select_m/" >\
cat $WEBTPL/awstats/nav.tpl | sed "s/%select_month%/$select_m/" >\
$dir/nav.html
}

12
func/db.sh
View file

@ -55,7 +55,7 @@ increase_dbhost_values() {
else
old_users="U_SYS_USERS='$U_SYS_USERS'"
new_users="U_SYS_USERS='$U_SYS_USERS'"
if [ -z "$(echo $U_SYS_USERS|sed -e "s/,/\n/g"|grep -w $user)" ]; then
if [ -z "$(echo $U_SYS_USERS|sed "s/,/\n/g"|grep -w $user)" ]; then
old_users="U_SYS_USERS='$U_SYS_USERS'"
new_users="U_SYS_USERS='$U_SYS_USERS,$user'"
fi
@ -74,10 +74,10 @@ decrease_dbhost_values() {
new_dbbases="U_DB_BASES='$((U_DB_BASES - 1))'"
old_users="U_SYS_USERS='$U_SYS_USERS'"
U_SYS_USERS=$(echo "$U_SYS_USERS" |\
sed -e "s/,/\n/g"|\
sed -e "s/^$user$//g"|\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "s/,/\n/g"|\
sed "s/^$user$//g"|\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
new_users="U_SYS_USERS='$U_SYS_USERS'"
sed -i "s/$old_dbbases/$new_dbbases/g" $VESTA/conf/$TYPE.conf
@ -566,7 +566,7 @@ get_pgsql_disk_usage() {
query="SELECT pg_database_size('$database');"
usage=$(psql -h $HOST -U $USER -c "$query")
usage=$(echo "$usage" | grep -v "-" | grep -v 'row' | sed -e "/^$/d")
usage=$(echo "$usage" | grep -v "-" | grep -v 'row' | sed "/^$/d")
usage=$(echo "$usage" | grep -v "pg_database_size" | awk '{print $1}')
if [ -z "$usage" ]; then
usage=0

10
func/domain.sh
View file

@ -160,7 +160,7 @@ update_domain_zone() {
line=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
fields='$RECORD\t$TTL\tIN\t$TYPE\t$PRIORITY\t$VALUE'
if [ -e $conf ]; then
zn_serial=$(head $conf|grep 'SOA' -A1|tail -n 1|sed -e "s/ //g")
zn_serial=$(head $conf|grep 'SOA' -A1|tail -n 1|sed "s/ //g")
s_date=$(echo ${zn_serial:0:8})
c_date=$(date +'%Y%m%d')
if [ "$s_date" == "$c_date" ]; then
@ -190,13 +190,13 @@ update_domain_zone() {
" > $conf
while read line ; do
IFS=$'\n'
for key in $(echo $line|sed -e "s/' /'\n/g"); do
for key in $(echo $line|sed "s/' /'\n/g"); do
eval ${key%%=*}="${key#*=}"
done
RECORD=$(idn --quiet -a -t "$RECORD")
if [ "$SUSPENDED" != 'yes' ]; then
eval echo -e "\"$fields\""|sed -e "s/%quote%/'/g" >> $conf
eval echo -e "\"$fields\""|sed "s/%quote%/'/g" >> $conf
fi
done < $USER_DATA/dns/$domain.conf
}
@ -276,8 +276,8 @@ change_web_config() {
get_web_config_brds || exit $?
vhost=$(grep -A $aftr_line -B $bfr_line -ni "Name $domain_idn" $conf)
str=$(echo "$vhost" | grep -F "$search_phrase" | head -n 1)
str_numb=$(echo "$str" | sed -e "s/-/=/" | cut -f 1 -d '=')
str_cont=$(echo "$str" | sed -e "s/-/=/" | cut -f 2 -d '=')
str_numb=$(echo "$str" | sed "s/-/=/" | cut -f 1 -d '=')
str_cont=$(echo "$str" | sed "s/-/=/" | cut -f 2 -d '=')
str_repl=$(echo "$str_repl" | sed \
-e 's/\\/\\\\/g' \

8
func/ip.sh
View file

@ -149,10 +149,10 @@ decrease_ip_value() {
check_ip=$(grep $sip $USER_DATA/web.conf |wc -l)
if [ "$check_ip" -lt 2 ]; then
new_usr=$(echo "$current_usr" |\
sed -e "s/,/\n/g"|\
sed -e "s/^$user$//g"|\
sed -e "/^$/d"|\
sed -e ':a;N;$!ba;s/\n/,/g')
sed "s/,/\n/g"|\
sed "s/^$user$//g"|\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
else
new_usr="$current_usr"
fi

2
func/main.sh
View file

@ -278,7 +278,7 @@ get_object_value() {
update_object_value() {
row=$(grep -n "$2='$3'" $USER_DATA/$1.conf)
lnr=$(echo $row | cut -f 1 -d ':')
object=$(echo $row | sed -e "s/^$lnr://")
object=$(echo $row | sed "s/^$lnr://")
eval "$object"
eval old="$4"
old=$(echo "$old" | sed -e 's/\\/\\\\/g' -e 's/&/\\&/g' -e 's/\//\\\//g')