From 38ecbdc3e1d7bb4bda83538d3b0dfd00ac55f7e9 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Tue, 16 Oct 2007 22:30:23 +0000
Subject: fixed ticket #19

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@449 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/doc/CHANGELOG        | 7 ++++++-
 trunk/lib/common.sh        | 6 ++++--
 trunk/simplepkg.SlackBuild | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'trunk')

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index a16bb53..74a8992 100644
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,9 +1,14 @@
 simplepkg changelog
 ===================
 
-0.6pre1-5
+0.6pre1-8
 =========
 
+  - common.sh: 
+    - fixed http://slack.sarava.org/trac/ticket/19
+
+  - added simpletrack script
+
   - simplaret:
     - lots of fixes (thanks Diogo for finding and reporting two of them)
     - performance enhancement on --upgrade
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 658c66d..91f715f 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -311,7 +311,9 @@ function default_version {
   if [ -f "$1/etc/slackware-version" ]; then
     cat $1/etc/slackware-version | awk '{ print $2 }' | sed -e 's/.0$//'
   else
-    echo "none"
+    aaa_base="`basename $(ls $1/var/log/packages/aaa_base-[0-9]* 2> /dev/null)`"
+    pack="`basename $aaa_base | sed -e 's/-[^-]*-[^-]*-[^-]*$//'`"
+    echo $aaa_base | sed -e "s/^$pack-//" | cut -d "-" -f 1 | sed -e 's/.0$//'
   fi
 
 }
@@ -324,7 +326,7 @@ function default_arch {
   arch="`cat $1/etc/slackware-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
 
   if [ -z "$arch" ]; then
-    echo i386
+    echo `uname -m`
   else
     echo $arch
   fi
diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 8ee22fd..e849d22 100755
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -18,7 +18,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre7"
+VERSION="0.6pre8"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"
-- 
cgit v1.2.3