github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-06 04:51:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

check_result() refactoring

Browse source
This commit is contained in:
Serghey Rodin 2016-06-24 18:04:16 +03:00
parent ebc53f6129
commit b67632d578
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bin/v-change-sys-ip-status
View file

@ -27,18 +27,13 @@ check_args '2' "$#" 'IP IP_STATUS'
is_format_valid 'ip' 'ip_status' is_format_valid 'ip' 'ip_status'
is_ip_valid "$ip" is_ip_valid "$ip"
if [ "$ip_status" = "$(get_ip_value '$STATUS')" ]; then if [ "$ip_status" = "$(get_ip_value '$STATUS')" ]; then
echo "Error: status $ip_status is already set" check_result "$E_EXISTS" "status $ip_status is already set"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi fi
web_domains=$(get_ip_value '$U_WEB_DOMAINS') web_domains=$(get_ip_value '$U_WEB_DOMAINS')
sys_user=$(get_ip_value '$U_SYS_USERS') sys_user=$(get_ip_value '$U_SYS_USERS')
ip_owner=$(get_ip_value '$OWNER') ip_owner=$(get_ip_value '$OWNER')
if [ "$web_domains" -ne '0' ] && [ "$sys_user" != "$ip_owner" ]; then if [ "$web_domains" -ne '0' ] && [ "$sys_user" != "$ip_owner" ]; then
echo "Error: ip $ip is used" check_result "$E_INUSE" "ip $ip is used"
log_event "$E_INUSE" "$ARGUMENTS"
exit $E_INUSE
fi fi