diff options
| -rw-r--r-- | doc/CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/common.sh | 8 | ||||
| -rwxr-xr-x | simplepkg.SlackBuild | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 9f53214..96de132 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,7 +1,7 @@ simplepkg changelog ------------------- -0.4.9pre10-15: lots of simplaret fixes +0.4.9pre10-16: lots of simplaret fixes 0.4.9pre9: createpkg: - speedup diff --git a/lib/common.sh b/lib/common.sh index 3411f2c..a140ccb 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -108,7 +108,7 @@ function install_packages { for pack in `cat $TEMPLATE | grep -v -e "^#" | cut -d : -f 1`; do # try to install the package - ROOT=/$root ARCH=$ARCH VERSION=$VERSION $SIMPLARET --install $pack + ROOT=/$root ARCH=$ARCH VERSION=$VERSION $SIMPLARET --install $pack --skip-checks # check if the package was installed installed=`eval "ls /$root/var/log/packages/ | egrep '^$pack-[^-]+-[^-]+-[^-]+$'"` @@ -255,7 +255,11 @@ function eval_config { function default_version { # get version from /etc/slackware-version - cat $1/etc/slackware-version | awk '{ print $2 }' | sed -e 's/.0$//' + if [ -f "$1/etc/slackware-version" ]; then + cat $1/etc/slackware-version | awk '{ print $2 }' | sed -e 's/.0$//' + else + echo "none" + fi } diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild index fd9cf86..a43f082 100755 --- a/simplepkg.SlackBuild +++ b/simplepkg.SlackBuild @@ -6,7 +6,7 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD=${BUILD:=1rha} -VERSION="0.4.9pre15" +VERSION="0.4.9pre16" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" BINDIR="/usr/bin" |