fixed ticket #19

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index a16bb53277ce2c568ccc77ee0cd2960d066b976b..74a8992e7a0d7fc79d7d99d6f5dc0f503bc653b0 100644 (file)
--- 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 658c66d5b611f869899bd28e60d94a0ed36288b4..91f715ffcaf9c4cc593cd6fcafbefa8db4cca946 100644 (file)
--- 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 8ee22fd64618c054933680cde620195d2883e63e..e849d220302c733fad66376d7b56956b96935274 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.6pre7"
+VERSION="0.6pre8"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"