From 958eceb5c16f8b5acb4463f45d56bccc32878049 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Fri, 10 Jun 2011 10:48:42 +0200
Subject: fix rpm/deb creation

---
 tools/installer | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/installer b/tools/installer
index 64f64158..41b682e4 100755
--- a/tools/installer
+++ b/tools/installer
@@ -437,8 +437,10 @@ build_dpkg_package()
 	sed -i -e "4r./packaging/dpkg/debianpaths" \
     	$SLX_DEPBUILD_PATH/DEBIAN/postinst
 
+        PKG_VERSION=$(echo $OPENSLX_VERSION | sed -e "s/^v//" -e "s/-[^-]*$//")
+
 	#update control file
-	sed -e "s/##version##/$OPENSLX_VERSION/" \
+	sed -e "s/##version##/$PKG_VERSION/" \
 	    -e "s/##size##/$(du -s $SLX_BUILD_PATH | awk '{print $1}')/" \
 	    -i  $SLX_DEPBUILD_PATH/DEBIAN/control
 	
@@ -451,7 +453,6 @@ build_dpkg_package()
 	
 	echo -e " [${LightGreen}ok${NC}]"
 
-        bash
 	mkdir -p $INSTALL_HOME/pkgs/
 	cp  $SLX_DEPBUILD_PATH.deb $INSTALL_HOME/pkgs/$VERSIONSTRING.deb
 	cd $INSTALL_HOME
-- 
cgit v1.2.3-55-g7522