aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-01-31 23:39:40 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-01-31 23:39:40 +0000
commitff9feb4850bb7827995944528a8b9281ea38701b (patch)
tree06d6e84a91a35a821dc8baa30af64598949b8610 /lib
parent9746560c222f7af5beb202e09ad90987dc68a75e (diff)
downloadsimplepkg-ff9feb4850bb7827995944528a8b9281ea38701b.tar.gz
simplepkg-ff9feb4850bb7827995944528a8b9281ea38701b.tar.bz2
simplaret: more file retrieval enhancements
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@139 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'lib')
-rw-r--r--lib/common.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common.sh b/lib/common.sh
index 4bfb381..a729472 100644
--- 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"