simplaret: small fixes, thanks diogo :)

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

diff --git a/trunk/conf/repos.conf.new b/trunk/conf/repos.conf.new
index 1d77419f87f0cd11928fd68d53c96555aeec1302..187377c58ef76af0d80c4beec290e84c1200e8b9 100644 (file)
--- a/trunk/conf/repos.conf.new
+++ b/trunk/conf/repos.conf.new
@@ -39,3 +39,7 @@ PATCHES-x86_64-11.0="sarava%http://slack.sarava.org/slamd64/slamd64-11.0/patches
 REPOS-powerpc-11.0="sarava%http://slack.sarava.org/packages/slackintosh/slackintosh-11.0/"
 PATCHES-powerpc-11.0="workaround%http://slackintosh.workaround.ch/pub/slackintosh/11.0/patches/"
 
+# i386 12.0
+REPOS-i386-12.0="sarava%http://slack.sarava.org/packages/slackware/slackware-12.0/"
+PATCHES-i386-12.0="sarava%http://slack.sarava.org/packages/slackware/slackware-12.0/patches/"
+

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index f87b540d81d0b54dfea340b41d898010c8084167..e708391659a10e4f406746112e8d849d72466215 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre4"
+VERSION="0.6pre5"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 29e3b751327c25df0327832dd6a230f7ebb46d66..b08ba590ceb8b0f78d8a3d19dda09e4d5349cb68 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -1060,6 +1060,15 @@ function simplaret_check_url {
     return 1
   fi
 
+  if echo $1 | grep -q -e "^file:///"; then
+    url="`echo $1 | sed -e 's/file:\/\///'`"
+    if [ -e "$url" ]; then
+      return 0
+    else
+      return 1
+    fi
+  fi
+
   if [ ! -z "$CONNECT_TIMEOUT" ] || [ "$CONNECT_TIMEOUT" != "0" ]; then
     curl_timeout="--connect-timeout $CONNECT_TIMEOUT"
   fi
@@ -1101,6 +1110,16 @@ function simplaret_solve_dep {
 
 }
 
+function simplaret_req_arg {
+
+  # requires arg
+
+  if [ -z "$1" ]; then
+    simplaret_usage;
+  fi
+
+}
+
 if [ -z "$1" ]; then
   simplaret_usage
   exit 1
@@ -1119,13 +1138,13 @@ BASENAME="`basename $0`[$SIMPLARET_CHILD]"
 
 case $1 in
   "--update" | "update") simplaret_update ;;
-  "--search" | "search") shift ; simplaret_search $* ;;
-  "--get" | "get") shift ; simplaret_get $* ;;
-  "--get-patches" | "get-patches") simplaret_get_patches ;;
-  "--purge" | "purge") shift ; simplaret_purge $* ;;
-  "--install" | "install") shift ; simplaret_install $* ;;
   "--upgrade" | "upgrade") simplaret_get_patches --upgrade ;;
-  "--remove" | "remove") ROOT=/$ROOT removepkg $2 ;;
+  "--get-patches" | "get-patches") simplaret_get_patches ;;
+  "--search" | "search") shift ; simplaret_req_arg $1 ; simplaret_search $* ;;
+  "--get" | "get") shift ; simplaret_req_arg $1 ; simplaret_get $* ;;
+  "--purge" | "purge") shift ; simplaret_req_arg $1 simplaret_purge $* ;;
+  "--install" | "install") shift ; simplaret_req_arg $1 ; simplaret_install $* ;;
+  "--remove" | "remove") simplaret_req_arg $2 ; ROOT=/$ROOT removepkg $2 ;;
   *) simplaret_usage ;;
 esac