diff options
| -rw-r--r-- | trunk/doc/CHANGELOG | 5 | ||||
| -rw-r--r-- | trunk/lib/common.sh | 11 | ||||
| -rwxr-xr-x | trunk/simplepkg.SlackBuild | 2 | ||||
| -rwxr-xr-x | trunk/src/simpletrack | 8 |
4 files changed, 18 insertions, 8 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 7bd5bc9..05c6ea6 100644 --- 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 2e36341..4b76e6d 100644 --- 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 ca289be..e5678c1 100755 --- 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 781e3e9..c643a89 100755 --- 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 |