From f515160bd643c9e79426c08623b700ac0d22ae22 Mon Sep 17 00:00:00 2001 From: Von Random Date: Wed, 18 Feb 2015 18:59:23 +0300 Subject: swap some string tests to math tests --- backup.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backup.zsh b/backup.zsh index 074d40d..6022da3 100755 --- a/backup.zsh +++ b/backup.zsh @@ -47,7 +47,7 @@ function apply_config cfg_err 'remote_pass' return 5 fi - if [[ -n $port && ! $port =~ ^[0-9]+$ ]]; then + if ! (( port )); then err 'remote_port is not a numeric value.' return 5 fi @@ -64,8 +64,8 @@ function apply_config # set defaults and / or fail to run if something is missing local exit_code case $protocol in - ('ftp'|'ftps') port=${remote_port:-$default_ftp_port}; test_remote_settings; exit_code=$?; [[ $exit_code -ne 0 ]] && return $exit_code;; - ('sftp'|'ssh') port=${remote_port:-$default_ssh_port}; test_remote_settings; exit_code=$?; [[ $exit_code -ne 0 ]] && return $exit_code;; + ('ftp'|'ftps') port=${remote_port:-$default_ftp_port}; test_remote_settings; exit_code=$?; (( exit_code )) && return $exit_code;; + ('sftp'|'ssh') port=${remote_port:-$default_ssh_port}; test_remote_settings; exit_code=$?; (( exit_code )) && return $exit_code;; ('local') unset remote_port;; (*) cfg_err 'protocol'; return 5;; esac @@ -159,7 +159,7 @@ function main apply_config # fail in case something goes wrong local exit_code=$? - [[ $exit_code -ne 0 ]] && return $exit_code + (( exit_code )) && return $exit_code unset exit_code # run backups per directory for i in $source_dirs; do -- cgit v1.2.3