simplepkg 0.4.9pre16

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 9f532149bda2b40537fb2a6c568943290cc4cace..96de1320d53ff14a05b565e6852c8c8a1f19c600 100644 (file)
--- 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 3411f2c82444b3d6b252b4bbb2a2d62e115b8b55..a140ccb89d81ac211b66c4d7ce2e739e7b4891b5 100644 (file)
--- 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 fd9cf86b2219f5a45359572675e28b9a328f4cad..a43f0828999cdef673a4b9050c2be8c08fba32ba 100755 (executable)
--- 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"