small fixes

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 7bd5bc9f7e22e070160332f775bb2cc630c35c7a..05c6ea6dbb16f88a203982a10f187695fce4b930 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,11 @@
 simplepkg changelog
 ===================
 
+0.6pre18
+========
+
+  - common.sh: fixed default_arch
+  - simpletrack: error message
 
 0.6pre17
 ========

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 2e36341fffa9c104ea08ce03481ad03819460a58..4b76e6d399bd470df204b8e9af19541b9cd3bcb8 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -324,12 +324,11 @@ function default_arch {
 
   if [ -f "$1/etc/slackware-version" ]; then
     arch="`cat $1/etc/slackware-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
-  elif [ -f "$1/etc/slamd64-version" ]; then
-    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/)//'`"
+    if [ -z "$arch" ]; then
+      arch="i386"
+    fi
+  elif [ -f "$1/etc/slamd64-version" ] || [ -f "$1/etc/bluewhite64-version" ] || [ -f "$1/etc/sflack-version" ]; then
+    arch="x86_64"
   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/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index ca289be20e80a82de04e82edd22c5f5dc49435df..e5678c1a1693a17e96e0cc65daaba09dcca98502 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -18,7 +18,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre17"
+VERSION="0.6pre18"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/trunk/src/simpletrack b/trunk/src/simpletrack
index 781e3e9c344ed7aabb23a553d456466114ac297d..c643a8953dbc7c2f7642c1ed1756c67d21702d75 100755 (executable)
--- a/trunk/src/simpletrack
+++ b/trunk/src/simpletrack
@@ -51,10 +51,16 @@ fi
 
 for tracker in $PRIORITY; do
        path="`which $tracker 2> /dev/null`"
-       if [ "$?" == "0" ]; then
+       found="$?"
+       if [ "$found" == "0" ]; then
                echo $BASENAME: using $tracker...
                $tracker $path $*
                break
        fi
 done
 
+if [ "$found" != "0" ]; then
+  echo "Can't find any suitable tracker among $PRIORITY"
+  echo "Does slacktrack package is installed in your system?"
+  exit 1
+fi