Serghey Rodin 13 лет назад
Родитель
Сommit
50f7bcc66e
6 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      bin/v_backup_users
  2. 1 1
      bin/v_update_sys_queue
  3. 1 1
      bin/v_update_sys_rrd
  4. 1 1
      bin/v_update_sys_vesta
  5. 1 1
      bin/v_update_user_stats
  6. 1 1
      func/main.sh

+ 1 - 1
bin/v_backup_users

@@ -11,7 +11,7 @@
 
 # Importing system enviroment  as we run this script 
 # mostly by cron wich not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf

+ 1 - 1
bin/v_update_sys_queue

@@ -17,7 +17,7 @@ queue=$1
 
 # Importing system enviroment  as we run this script
 # mostly by cron wich not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf

+ 1 - 1
bin/v_update_sys_rrd

@@ -12,7 +12,7 @@
 
 # Importing system enviroment  as we run this script
 # mostly by cron wich do not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf

+ 1 - 1
bin/v_update_sys_vesta

@@ -15,7 +15,7 @@ version=$1
 updates=''
 
 # Importing system enviroment
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf

+ 1 - 1
bin/v_update_user_stats

@@ -14,7 +14,7 @@ user=$1
 
 # Importing system enviroment  as we run this script 
 #       mostly by cron wich not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf

+ 1 - 1
func/main.sh

@@ -742,7 +742,7 @@ validate_format(){
             stats_user)     validate_format_username "$arg" "$arg_name" ;;
             template)       validate_format_username "$arg" "$arg_name" ;;
             ttl)            validate_format_int "$arg" ;;
-            user)           validate_format_username "$arg" ;;
+            user)           validate_format_username "$arg" "$arg_name" ;;
             wday)           validate_format_mhdmw "$arg" $arg_name ;;
         esac
     done