mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-21 13:54:26 -07:00
removed unnecessary sed expr defenition
This commit is contained in:
parent
5afa0f4a00
commit
861585bcca
30 changed files with 74 additions and 74 deletions
12
func/db.sh
12
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
|
||||
|
|
|
@ -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' \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue