X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=DEBIAN%2Fmk_erp_deb.sh;h=b3d47bc77c8ee2aabe6eb5a03ea454c1ba12f87d;hb=31d232e6d4470ceea3e600eeebc6c1e668f383df;hp=cfb0624485314fe791aececf981c28952b9261bc;hpb=749f3e348f2e0d2250f86ebff8dfbda5a645a344;p=kivitendo-erp.git

diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh
index cfb062448..b3d47bc77 100755
--- a/DEBIAN/mk_erp_deb.sh
+++ b/DEBIAN/mk_erp_deb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #Jedes neue Paket der gleichen Version bekommt eine eigene Nummer
-NR="0"
+NR="${NR:-0}"
 
 #hier wurde das Git-Paket entpakt:
 SRC=/tmp/lx-office-erp
@@ -15,7 +15,7 @@ DST=/tmp/package
 ################################################
 
 VER=`cat VERSION`
-DEST=$DST/lx-office-erp_$VER-$NR$1-all
+DEST=$DST/lx-office-erp_$VER-$NR$1_all
 
 
 mkdir -p $DEST
@@ -52,7 +52,6 @@ cp $SRC/menu.ini usr/lib/lx-office-erp/menu.default
 cp -a $SRC/css var/lib/lx-office-erp
 cp -a $SRC/templates var/lib/lx-office-erp
 cp -a $SRC/users var/lib/lx-office-erp
-cp -a $SRC/xslt var/lib/lx-office-erp
 
 cp -a $SRC/doc/* usr/share/doc/lx-office-erp/
 cp -a $SRC/image/* usr/share/lx-office-erp/
@@ -77,7 +76,7 @@ find var/ -name "*" -type f -exec md5sum {} \; >> DEBIAN/md5sum
 find etc/ -name "*" -type f -exec md5sum {} \; >> DEBIAN/md5sum
 
 #Größe feststellen:
-SIZE=`du -scb . | grep insgesamt | cut -f1`
+SIZE=`du -scb . | tail -n 1 | cut -f1`
 
 #Controlfile updaten:
 sed --in-place --expression "s/Installed-Size: 0/Installed-Size: $SIZE/g" DEBIAN/control
@@ -86,6 +85,6 @@ sed --in-place --expression "s/Version: 0/Version: $VER-$NR/g" DEBIAN/control
 
 #Paket bauen:
 cd ..
-dpkg-deb --build lx-office-erp_$VER-$NR$1-all
+dpkg-deb --build lx-office-erp_$VER-$NR$1_all
 
 echo "Done"