removed unnecessary sed expr defenition

serghey-rodin · serghey-rodin · commit 861585bcca15 · 2013-10-27T13:54:31.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -81,15 +81,15 @@ 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
 
     # mod_rpaf
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/func/domain.sh b/func/domain.sh
diff --git a/func/ip.sh b/func/ip.sh
diff --git a/func/main.sh b/func/main.sh
