simplepkg 0.4.9pre15

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ed294086138011b5fd39114bdd14bb371d5cdf76..9f532149bda2b40537fb2a6c568943290cc4cace 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,7 +1,7 @@
 simplepkg changelog
 -------------------
 
-0.4.9pre10-14: simplaret small fixes
+0.4.9pre10-15: lots of simplaret fixes
 
 0.4.9pre9: createpkg:
              - speedup

diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild
index 5647bb8fd6040dbabba47a3548685163cbbb5fdb..fd9cf86b2219f5a45359572675e28b9a328f4cad 100755 (executable)
--- a/simplepkg.SlackBuild
+++ b/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.4.9pre14"
+VERSION="0.4.9pre15"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/src/simplaret b/src/simplaret
index b58e41b60a51d96b8c1546982b7074e94a330f0b..075cd7cb26a6242a319f3ec92896dfda6ae5ce0d 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -71,11 +71,12 @@ function simplaret_download {
   # download a file from a repo to a folder
   # usage: simplaret <repository_url> <package> <destination-folder>
 
-  local protocol
+  local protocol file
   local wget_timeout wget_passive_ftp
   local ncftpget_timeout ncftpget_passive_ftp
 
   protocol="`echo $1 | cut -d : -f 1`"
+  file="`basename $2`"
 
   if [ ! -d "$3" ]; then
     mkdir -p $3
@@ -87,16 +88,16 @@ function simplaret_download {
   fi
 
   if [ "$protocol" == "http" ]; then
-    wget $wget_timeout $1/$2 -O $3/$2
+    wget $wget_timeout $1/$2 -O $3/$file
   elif [ "$protocol" == "ftp" ]; then
     if [ "$PASSIVE_FTP" == "1" ]; then
       wget_passive_ftp="--passive-ftp"
       ncftpget_passive_ftp="-F"
     fi 
     if [ "$FTP_TOOL" == "ncftpget" ]; then
-      ncftpget -c $ncftpget_timeout $ncftpget_passive_ftp $1/$2 > $3/$2
+      ncftpget -c $ncftpget_timeout $ncftpget_passive_ftp $1/$2 > $3/$file
     elif [ "$FTP_TOOL" == "wget" ]; then
-      wget $wget_timeout $wget_passive_ftp $1/$2 -O $3/$2
+      wget $wget_timeout $wget_passive_ftp $1/$2 -O $3/$file
     else
       echo $BASENAME: error: invalid value for config variable FTP_TOOL: $FTP_TOOL
       echo $BASENAME: please check your config file $CONF
@@ -106,7 +107,7 @@ function simplaret_download {
     url="`echo $1 | sed -e 's/file:\/\///'`"
     if [ -f "$url/$2" ]; then
       echo -n "Copying $url/$2..."
-      cp $url/$2 $3/$2 2> /dev/null
+      cp $url/$2 $3/$file 2> /dev/null
       if [ "$?" == "0" ]; then
         echo " done."
       else