Javascriptmenü: Eventhandling korrigiert

[kivitendo-erp.git] / DEBIAN / mk_erp_deb.sh

diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh
index d656752..b3d47bc 100755 (executable)
--- 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
@@ -44,6 +44,7 @@ cp -a $SRC/scripts usr/lib/lx-office-erp
 cp -a $SRC/sql usr/lib/lx-office-erp
 cp -a $SRC/t usr/lib/lx-office-erp
 cp -a $SRC/*.pl usr/lib/lx-office-erp
+cp -a $SRC/dispatcher.f* usr/lib/lx-office-erp
 cp $SRC/VERSION usr/lib/lx-office-erp
 cp $SRC/index.html usr/lib/lx-office-erp
 cp $SRC/config/lx_office.conf.default etc/lx-office-erp/lx_office.conf.default
@@ -51,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/
@@ -76,17 +76,15 @@ 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:
-cat DEBIAN/control | sed --expression "s/Installed-Size: 0/Installed-Size: $SIZE/g" > DEBIAN/1.tmp
-mv DEBIAN/1.tmp DEBIAN/control
-cat DEBIAN/control | sed --expression "s/Version: 0/Version: $VER-$NR/g" > DEBIAN/1.tmp
-mv DEBIAN/1.tmp DEBIAN/control
+sed --in-place --expression "s/Installed-Size: 0/Installed-Size: $SIZE/g" DEBIAN/control
+sed --in-place --expression "s/Version: 0/Version: $VER-$NR/g" DEBIAN/control
 #Revisionsnummer evtl. von Hand eintragen
 
 #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"