From: Andrey Paskal Date: Mon, 27 Apr 2009 14:16:59 +0000 (+0400) Subject: Removed install scripts for inventory. X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=b6833fad216acd4cab2aa2edb53d700f9605cc89;p=projects%2Fananas-labs-qt4.git Removed install scripts for inventory. --- diff --git a/build/ubuntu/postinst b/build/ubuntu/postinst index 176a667..b6c1766 100644 --- a/build/ubuntu/postinst +++ b/build/ubuntu/postinst @@ -21,20 +21,20 @@ case "$1" in configure) #starts mysql server - [ -e /etc/init.d/mysql ] && /etc/init.d/mysql status|grep stopped > /dev/null && /etc/init.d/mysql start > /dev/null || : +# [ -e /etc/init.d/mysql ] && /etc/init.d/mysql status|grep stopped > /dev/null && /etc/init.d/mysql start > /dev/null || : #creates databases - mysql -u root -e "create database ananas_inventory character set utf8" > /dev/null 2>&1 && mysql -u root \ - ananas_inventory < /usr/share/ananas/inventory/inventory.sql || : - mysql -u root -e "create database ananas_inventory_demo character set utf8" > /dev/null 2>&1 && mysql -u root \ - ananas_inventory_demo < /usr/share/ananas/inventory/inventory-demo.sql || : +# mysql -u root -e "create database ananas_inventory character set utf8" > /dev/null 2>&1 && mysql -u root \ +# ananas_inventory < /usr/share/ananas/inventory/inventory.sql || : +# mysql -u root -e "create database ananas_inventory_demo character set utf8" > /dev/null 2>&1 && mysql -u root \ +# ananas_inventory_demo < /usr/share/ananas/inventory/inventory-demo.sql || : #creates system base for mysql - mysqlshow -u root| grep ananas_system > /dev/null || mysqladmin -u root create ananas_system || : +# mysqlshow -u root| grep ananas_system > /dev/null || mysqladmin -u root create ananas_system || : - ln -fs /usr/lib/ananas/qt3plugins/designer/libananasplugin.so /usr/lib/libananasplugin.so - chmod 666 /etc/ananas/* || : - chmod 777 /etc/ananas + ln -fs /usr/lib/ananas/qt4plugins/designer/libananasplugin.so /usr/lib/libananasplugin.so +# chmod 666 /etc/ananas/* || : +# chmod 777 /etc/ananas ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/build/ubuntu/prerm b/build/ubuntu/prerm index 2f242ad..5bcbd8c 100644 --- a/build/ubuntu/prerm +++ b/build/ubuntu/prerm @@ -21,12 +21,12 @@ case "$1" in remove) rm -f /usr/share/ananas/translations/*.qm rm -f /usr/share/ananas/templates/*.* - rm -f /usr/share/ananas/inventory/templ_*.odt - rm -f /usr/share/ananas/inventory/templ_*.ods - rm -f /etc/ananas/inventory.* - rm -f /etc/ananas/inventory-demo.* - rm -f /etc/ananas/inventory_grouprc - rm -f /etc/ananas/.* +# rm -f /usr/share/ananas/inventory/templ_*.odt +# rm -f /usr/share/ananas/inventory/templ_*.ods +# rm -f /etc/ananas/inventory.* +# rm -f /etc/ananas/inventory-demo.* +# rm -f /etc/ananas/inventory_grouprc +# rm -f /etc/ananas/.* [ -e /usr/share/ananas/inventory ] && rmdir --ignore-fail-on-non-empty /usr/share/ananas/inventory [ -e /usr/share/ananas/translations ] && rmdir --ignore-fail-on-non-empty /usr/share/ananas/translations [ -e /usr/share/ananas/template ] && rmdir --ignore-fail-on-non-empty /usr/share/ananas/templates diff --git a/build/ubuntu/rules b/build/ubuntu/rules index 9988abc..61269d5 100755 --- a/build/ubuntu/rules +++ b/build/ubuntu/rules @@ -79,10 +79,8 @@ install: build BINDIR=/usr/bin INCLUDEDIR=/usr/include/ananas #cd ../doc && qmake doc.pro -o Makefile && make install INSTALL_ROOT=$(CURDIR)/debian/ananas \ #DOCDIR=$(CURDIR)/debian/ananas/usr/share/doc/ananas - mkdir -p $(CURDIR)/debian/ananas/etc/ananas mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/translations mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/templates - mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/inventory mkdir -p $(CURDIR)/debian/ananas/usr/share/applications mkdir -p $(CURDIR)/debian/ananas/usr/share/pixmaps mkdir -p $(CURDIR)/debian/ananas/usr/lib/menu @@ -104,6 +102,8 @@ install: build cp -f ./build/icons/*.png $(CURDIR)/debian/ananas/usr/share/pixmaps/ # inventory +# mkdir -p $(CURDIR)/debian/ananas/etc/ananas +# mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/inventory # cp -f ./applications/inventory/inventory.cfg $(CURDIR)/debian/ananas/etc/ananas/ # cp -f ./applications/inventory/inventory.rc $(CURDIR)/debian/ananas/etc/ananas/ # cp -f ./applications/inventory/inventory_grouprc $(CURDIR)/debian/ananas/etc/ananas/