simplepkg 0.6pre11

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

diff --git a/trunk/conf/repos.conf.new b/trunk/conf/repos.conf.new
index 187377c58ef76af0d80c4beec290e84c1200e8b9..02ded0830608e7767c527b7bb5a463390208a3a9 100644 (file)
--- a/trunk/conf/repos.conf.new
+++ b/trunk/conf/repos.conf.new
@@ -6,11 +6,17 @@
 # root repositories
 ROOT-i386="tds%http://slackware.mirrors.tds.net/pub/slackware/"
 ROOT-i386="sarava%http://slack.sarava.org/slackware/"
+ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/"
+ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/"
 ROOT-x86_64="sarava%http://slack.sarava.org/slamd64/"
 ROOT-x86_64="slackadelic%http://mirror1.slackadelic.com/slamd64/"
 ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/"
-ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/"
-ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/"
+# If you want to use Bluewhite64 instead of Slamd64, please uncoment the
+# next line and make sure to comment out all other slamd64 repository definitions
+#ROOT-x86_64="bluewhite64%http://mirror.inode.at/data/bluewhite64/"
+# If you want to use Sflack instead of Slamd64, please uncoment the
+# next line and make sure to comment out all other slamd64 repository definitions
+#ROOT-x86_64="bluewhite64%http://webftp.slackarea.net/pub/sflack/"
 
 # noarch
 NOARCH="sarava%http://slack.sarava.org/packages/noarch"

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 2fcdb12d5faa885cca9f80c6d623ef4953812546..3a437c89cd8501ff5fecea6f9d5b6ee52f092f21 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -307,6 +307,8 @@ function default_version {
     cat $1/etc/slamd64-version | awk '{ print $2 }' | sed -e 's/.0$//'
   elif [ -f "$1/etc/bluewhite64-version" ]; then
     cat $1/etc/bluewhite64-version | awk '{ print $2 }' | sed -e 's/.0$//'
+  elif [ -f "$1/etc/sflack-version" ]; then
+    cat $1/etc/sflack-version | awk '{ print $2 }' | sed -e 's/.0$//'
   else
     aaa_base="`basename $(ls $1/var/log/packages/aaa_base-[0-9]* 2> /dev/null)`"
     echo `package_version $aaa_base`
@@ -326,6 +328,8 @@ function default_arch {
     arch="`cat $1/etc/slamd64-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
   elif [ -f "$1/etc/bluewhite64-version" ]; then
     arch="`cat $1/etc/bluewhite64-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
+  elif [ -f "$1/etc/sflack-version" ]; then
+    arch="`cat $1/etc/sflack-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
   else
     aaa_base="`basename $(ls $1/var/log/packages/aaa_base-[0-9]* 2> /dev/null)`"
     echo `package_arch $aaa_base`

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index cc388d67bba6283723e702261c690548d2f80c24..4886d6b35030666227c9e7be6592a49a5d91ea73 100644 (file)
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -1,7 +1,7 @@
 #################################################################
 ## Generic template for SlackBuilds
 ##
-## Version 0.9.1 - Luis ( luis at riseup d0t net)
+## Version 0.9.2 - Luis ( luis at riseup d0t net)
 ##                 Alves ( rudsonalves at yahoo d0t com d0t br )
 #################################################################
 #!/bin/bash

diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild
index 323c51565188da69eed25db206eb225acd244fdf..245cd010375ba5b77bafc07091468e8e791499c6 100644 (file)
--- a/trunk/mkbuild/perl.mkSlackBuild
+++ b/trunk/mkbuild/perl.mkSlackBuild
@@ -1,7 +1,7 @@
 ###################################################
 ## Perl template for SlackBuilds
 ##
-## Based on generic.mkSlackBuild version 0.8.1 by
+## Based on generic.mkSlackBuild version 0.9.2 by
 ## Luis (luis at riseup d0t net) and changed by
 ## Rhatto (rhatto at riseup d0t net)
 ##

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 7f96fbaac1bdeab3d67fe658d7e8bd9dfde6c52b..ff8552a2e813247a4ebc4419ad0da455675bd2a3 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -1112,7 +1112,7 @@ case $1 in
   "--remove" | "remove") simplaret_req_arg $2 ; ROOT=/$ROOT removepkg $2 ;;
   "--help" | "help") simplaret_usage ;;
   *)
-    if echo $1 | grep -v '^--'; then
+    if echo $1 | grep -q -v '^--'; then
       simplaret_install $*
     else
       simplaret_usage