From 861585bcca1512d54f78de57a08ee9a0a02f5724 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 27 Oct 2013 13:54:31 +0200
Subject: [PATCH] removed unnecessary sed expr defenition

---
 bin/v-add-backup-ftp-host         |  6 +++---
 bin/v-add-cron-job                |  2 +-
 bin/v-change-domain-owner         |  8 ++++----
 bin/v-change-user-ns              |  2 +-
 bin/v-delete-backup-ftp-host      |  8 ++++----
 bin/v-delete-dns-on-web-alias     |  2 +-
 bin/v-delete-mail-account-alias   |  8 ++++----
 bin/v-delete-mail-account-forward |  8 ++++----
 bin/v-delete-sys-ip               |  4 ++--
 bin/v-get-dns-domain-value        |  2 +-
 bin/v-get-mail-account-value      |  2 +-
 bin/v-get-mail-domain-value       |  2 +-
 bin/v-get-user-value              |  2 +-
 bin/v-get-web-domain-value        |  2 +-
 bin/v-list-dns-records            |  2 +-
 bin/v-list-dns-template           |  2 +-
 bin/v-list-mail-account-autoreply |  2 +-
 bin/v-list-mail-domain-dkim       |  4 ++--
 bin/v-list-web-domain-ssl         |  6 +++---
 bin/v-restore-user                | 10 +++++-----
 bin/v-search-object               |  4 ++--
 bin/v-search-user-object          |  4 ++--
 bin/v-update-sys-ip-counters      |  2 +-
 bin/v-update-sys-rrd-net          |  4 ++--
 bin/v-update-user-backups         | 10 +++++-----
 bin/v-update-web-domain-stat      |  8 ++++----
 func/db.sh                        | 12 ++++++------
 func/domain.sh                    | 10 +++++-----
 func/ip.sh                        |  8 ++++----
 func/main.sh                      |  2 +-
 30 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/bin/v-add-backup-ftp-host b/bin/v-add-backup-ftp-host
index 06318583..e6c8d26c 100755
--- a/bin/v-add-backup-ftp-host
+++ b/bin/v-add-backup-ftp-host
@@ -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
 
diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job
index 3857668a..3f2c2255 100755
--- a/bin/v-add-cron-job
+++ b/bin/v-add-cron-job
@@ -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
 
diff --git a/bin/v-change-domain-owner b/bin/v-change-domain-owner
index 708c35c6..c6d6f07a 100755
--- a/bin/v-change-domain-owner
+++ b/bin/v-change-domain-owner
@@ -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
 
diff --git a/bin/v-change-user-ns b/bin/v-change-user-ns
index d4c1796f..a799257c 100755
--- a/bin/v-change-user-ns
+++ b/bin/v-change-user-ns
@@ -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"
diff --git a/bin/v-delete-backup-ftp-host b/bin/v-delete-backup-ftp-host
index d9c27318..a2b8811c 100755
--- a/bin/v-delete-backup-ftp-host
+++ b/bin/v-delete-backup-ftp-host
@@ -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
diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias
index e3eb69ed..0a574bd5 100755
--- a/bin/v-delete-dns-on-web-alias
+++ b/bin/v-delete-dns-on-web-alias
@@ -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)
diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias
index 7934c5b6..dd7e10fa 100755
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@@ -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')
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward
index 2a16ad21..a65aa6ab 100755
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@@ -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
diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
index fa69f333..54601bc1 100755
--- a/bin/v-delete-sys-ip
+++ b/bin/v-delete-sys-ip
@@ -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
 
diff --git a/bin/v-get-dns-domain-value b/bin/v-get-dns-domain-value
index b5b88d77..19112050 100755
--- a/bin/v-get-dns-domain-value
+++ b/bin/v-get-dns-domain-value
@@ -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
diff --git a/bin/v-get-mail-account-value b/bin/v-get-mail-account-value
index c920e2fa..db9f298b 100755
--- a/bin/v-get-mail-account-value
+++ b/bin/v-get-mail-account-value
@@ -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
diff --git a/bin/v-get-mail-domain-value b/bin/v-get-mail-domain-value
index 1fab391f..b6f4cc45 100755
--- a/bin/v-get-mail-domain-value
+++ b/bin/v-get-mail-domain-value
@@ -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
diff --git a/bin/v-get-user-value b/bin/v-get-user-value
index c51082e6..19ccf4ce 100755
--- a/bin/v-get-user-value
+++ b/bin/v-get-user-value
@@ -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
diff --git a/bin/v-get-web-domain-value b/bin/v-get-web-domain-value
index 16ae5c84..3e74e31e 100755
--- a/bin/v-get-web-domain-value
+++ b/bin/v-get-web-domain-value
@@ -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
diff --git a/bin/v-list-dns-records b/bin/v-list-dns-records
index 56ed5fb9..46e4da14 100755
--- a/bin/v-list-dns-records
+++ b/bin/v-list-dns-records
@@ -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
 }
 
diff --git a/bin/v-list-dns-template b/bin/v-list-dns-template
index 5ff2b337..348153e6 100755
--- a/bin/v-list-dns-template
+++ b/bin/v-list-dns-template
@@ -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
 }
 
diff --git a/bin/v-list-mail-account-autoreply b/bin/v-list-mail-account-autoreply
index c5ba6020..367f7e60 100755
--- a/bin/v-list-mail-account-autoreply
+++ b/bin/v-list-mail-account-autoreply
@@ -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
diff --git a/bin/v-list-mail-domain-dkim b/bin/v-list-mail-domain-dkim
index 37b8917e..72ba4009 100755
--- a/bin/v-list-mail-domain-dkim
+++ b/bin/v-list-mail-domain-dkim
@@ -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
diff --git a/bin/v-list-web-domain-ssl b/bin/v-list-web-domain-ssl
index eb79b8f2..a8696572 100755
--- a/bin/v-list-web-domain-ssl
+++ b/bin/v-list-web-domain-ssl
@@ -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
diff --git a/bin/v-restore-user b/bin/v-restore-user
index 24642f5a..531b6626 100755
--- a/bin/v-restore-user
+++ b/bin/v-restore-user
@@ -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)
diff --git a/bin/v-search-object b/bin/v-search-object
index a7bdf3aa..3c6ab0d4 100755
--- a/bin/v-search-object
+++ b/bin/v-search-object
@@ -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
diff --git a/bin/v-search-user-object b/bin/v-search-user-object
index 74637500..084b8b01 100755
--- a/bin/v-search-user-object
+++ b/bin/v-search-user-object
@@ -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
diff --git a/bin/v-update-sys-ip-counters b/bin/v-update-sys-ip-counters
index f25d5b12..dd51f9e9 100755
--- a/bin/v-update-sys-ip-counters
+++ b/bin/v-update-sys-ip-counters
@@ -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"
diff --git a/bin/v-update-sys-rrd-net b/bin/v-update-sys-rrd-net
index d493f7a0..d8daaa17 100755
--- a/bin/v-update-sys-rrd-net
+++ b/bin/v-update-sys-rrd-net
@@ -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}')
 
diff --git a/bin/v-update-user-backups b/bin/v-update-user-backups
index bb227800..df2c920d 100755
--- a/bin/v-update-user-backups
+++ b/bin/v-update-user-backups
@@ -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
diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat
index 6c617faa..b68deeb3 100755
--- a/bin/v-update-web-domain-stat
+++ b/bin/v-update-web-domain-stat
@@ -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
 }
 
diff --git a/func/db.sh b/func/db.sh
index b8ef30bc..707ce307 100644
--- a/func/db.sh
+++ b/func/db.sh
@@ -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
diff --git a/func/domain.sh b/func/domain.sh
index 56e90756..1b797aa8 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -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' \
diff --git a/func/ip.sh b/func/ip.sh
index f8ec8137..6e1bb06d 100644
--- a/func/ip.sh
+++ b/func/ip.sh
@@ -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
diff --git a/func/main.sh b/func/main.sh
index 2d5a9dd8..9117b40b 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -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')