From 964e94af811e34a0b86b73934e572bf0c9668735 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Sat, 27 Jan 2007 21:42:47 +0000
Subject: simplepkg 0.4.9pre12

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@129 04377dda-e619-0410-9926-eae83683ac58
---
 doc/CHANGELOG        |  4 +---
 lib/common.sh        |  2 +-
 simplepkg.SlackBuild |  2 +-
 src/simplaret        | 16 ++++++++++++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 341f1f3..2549f5d 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,9 +1,7 @@
 simplepkg changelog
 -------------------
 
-0.4.9pre10: small fixes
-
-0.4.9pre11: small fixes
+0.4.9pre10-12: small fixes
 
 0.4.9pre9: createpkg:
              - speedup
diff --git a/lib/common.sh b/lib/common.sh
index fccca64..3411f2c 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -151,7 +151,7 @@ function eval_parameter {
   # return the evaluated parameter if available or $2 $3 ... $n
 
   if grep -qe "^$1=" $CONF; then
-    grep -e "^$1=" $CONF | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/#.*$//'
+    grep -e "^$1=" $CONF | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
   else
     shift
     echo $*
diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild
index bd3af33..34ac27a 100755
--- a/simplepkg.SlackBuild
+++ b/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.4.9pre11"
+VERSION="0.4.9pre12"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"
diff --git a/src/simplaret b/src/simplaret
index 500e456..d3dc24f 100755
--- a/src/simplaret
+++ b/src/simplaret
@@ -87,16 +87,16 @@ function simplaret_download {
   fi
 
   if [ "$protocol" == "http" ]; then
-    (cd $3 && wget $wget_timeout $1/$2)
+    wget $wget_timeout $1/$2 -O $3/$2
   elif [ "$protocol" == "ftp" ]; then
     if [ "$PASSIVE_FTP" == "1" ]; then
       wget_passive_ftp="--passive-ftp"
       ncftpget_passive_ftp="-F"
     fi 
     if [ "$FTP_TOOL" == "ncftpget" ]; then
-      (cd $3 && ncftpget $ncftpget_timeout $ncftpget_passive_ftp $1/$2)
+      ncftpget -c $ncftpget_timeout $ncftpget_passive_ftp $1/$2 > $3/$2
     elif [ "$FTP_TOOL" == "wget" ]; then
-      (cd $3 && wget $wget_timeout $wget_passive_ftp $1/$2)
+      wget $wget_timeout $wget_passive_ftp $1/$2 -O $3/$2
     else
       echo $BASENAME: error: invalid value for config variable FTP_TOOL: $FTP_TOOL
       echo $BASENAME: please check your config file $CONF
@@ -104,7 +104,15 @@ function simplaret_download {
     fi
   elif [ "$protocol" == "file" ]; then
     url="`echo $1 | sed -e 's/file:\/\///'`"
-    cp $url/$2 $3 2> /dev/null
+    if [ -f "$url/$2" ]; then
+      echo -n "Copying $url/$2..."
+      cp $url/$2 $3/$2 2> /dev/null
+      if [ "$?" == "0" ]; then
+        echo " done."
+      else
+        echo " failed."
+      fi
+    fi
   fi
 
 }
-- 
cgit v1.2.3