simplaret: more file retrieval enhancements

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@139 04377dda-e619-0410-9926-eae83683ac58

diff --git a/lib/common.sh b/lib/common.sh
index 4bfb381ec796d58a352c3970f926f622e53003e2..a729472a07a0ade9f4eb05d9783133f9712de72d 100644 (file)
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -240,13 +240,13 @@ function eval_config {
     VERSION="$DEFAULT_VERSION"
   fi
 
-  if [ "$FTP_TOOL" != "wget" ] || [ "$FTP_TOOL" != "curl" ] || [ "$FTP_TOOL" != "ncftpget" ]; then
+  if [ "$FTP_TOOL" != "wget" ] && [ "$FTP_TOOL" != "curl" ] && [ "$FTP_TOOL" != "ncftpget" ]; then
     echo "$1 configuration error: invalid value $FTP_TOOL for config parameter FTP_TOOL"
     echo "$1 assuming value \"curl\" for variable FTP_TOOL"
     FTP_TOOL="curl"
   fi
 
-  if [ "$HTTP_TOOL" != "wget" ] || [ "$HTTP_TOOL" != "curl" ]; then
+  if [ "$HTTP_TOOL" != "wget" ] && [ "$HTTP_TOOL" != "curl" ]; then
     echo "$1 configuration error: invalid value $HTTP_TOOL for config parameter HTTP_TOOL"
     echo "$1 assuming value \"curl\" for variable HTTP_TOOL"
     HTTP_TOOL="curl"