2010-06-01 Miguel de Dios <miguel.dedios@artica.es>

* DEBIAN/postinst: fixed when the package DEB no have previus conf file.
	
	* DEBIAN/make_deb_package.sh: cleaned source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2874 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-06-08 14:41:18 +00:00
parent 3165aaa956
commit 952b554824
3 changed files with 41 additions and 71 deletions

View File

@ -1,3 +1,9 @@
2010-06-01 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/postinst: fixed when the package DEB no have previus conf file.
* DEBIAN/make_deb_package.sh: cleaned source code.
2010-06-04 Ramon Novoa <rnovoa@artica.es>
* pandora_server.spec: Fixed the %postun target.

View File

@ -64,76 +64,33 @@ mkdir temp_package
if [ $package_pandora -eq 1 ]
then
############################################
mkdir -p temp_package/usr/bin/
mkdir -p temp_package/usr/sbin/
mkdir -p temp_package/etc/init.d/
mkdir -p temp_package/etc/pandora/
touch temp_package/etc/pandora/pandora_server.conf
mkdir -p temp_package/var/spool/pandora/data_in
mkdir -p temp_package/var/spool/pandora/data_in/conf
mkdir -p temp_package/var/spool/pandora/data_in/md5
mkdir -p temp_package/var/log/pandora/
mkdir -p temp_package/usr/share/pandora_server/conf/
mkdir -p temp_package/usr/lib/perl5/
mkdir -p temp_package/usr/bin/
mkdir -p temp_package/usr/sbin/
mkdir -p temp_package/etc/init.d/
mkdir -p temp_package/etc/pandora/
touch temp_package/etc/pandora/pandora_server.conf
mkdir -p temp_package/var/spool/pandora/data_in
mkdir -p temp_package/var/spool/pandora/data_in/conf
mkdir -p temp_package/var/spool/pandora/data_in/md5
mkdir -p temp_package/var/log/pandora/
mkdir -p temp_package/usr/share/pandora_server/conf/
mkdir -p temp_package/usr/lib/perl5/
cp -aRf bin/pandora_server temp_package/usr/bin/
cp -aRf bin/pandora_exec temp_package/usr/bin/
cp -aRf bin/tentacle_server temp_package/usr/bin/
cp -aRf conf/* temp_package/usr/share/pandora_server/conf/
cp -aRf util temp_package/usr/share/pandora_server/
cp -aRf lib/* temp_package/usr/lib/perl5/
cp -aRf AUTHORS COPYING ChangeLog README temp_package/usr/share/pandora_server/
cp -aRf util/pandora_server temp_package/etc/init.d/
cp -aRf util/tentacle_serverd temp_package/etc/init.d/
rm -f temp_package/usr/share/pandora_server/util/PandoraFMS
rm -f temp_package/usr/share/pandora_server/bin/PandoraFMS
cp -aRf bin/pandora_server temp_package/usr/bin/
cp -aRf bin/pandora_exec temp_package/usr/bin/
cp -aRf bin/tentacle_server temp_package/usr/bin/
cp -aRf conf/* temp_package/usr/share/pandora_server/conf/
cp -aRf util temp_package/usr/share/pandora_server/
cp -aRf lib/* temp_package/usr/lib/perl5/
cp -aRf AUTHORS COPYING ChangeLog README temp_package/usr/share/pandora_server/
cp -aRf util/pandora_server temp_package/etc/init.d/
cp -aRf util/tentacle_serverd temp_package/etc/init.d/
rm -f temp_package/usr/share/pandora_server/util/PandoraFMS
rm -f temp_package/usr/share/pandora_server/bin/PandoraFMS
############################################
#~ echo "Make the fake tree system in \"temp_package\"."
#~ mkdir -p temp_package/var/spool/pandora/data_in/conf
#~ mkdir -p temp_package/var/spool/pandora/data_in/md5
#~ mkdir -p temp_package/var/log/pandora
#~ mkdir -p temp_package/etc/pandora
#~ mkdir -p temp_package/etc/init.d/
#~ mkdir -p temp_package/etc/logrotate.d
#~ mkdir -p temp_package/usr/share/pandora_server
#~ mkdir -p temp_package/usr/bin
#~
#~ echo "Make the perl of Pandora Server."
#~ perl Makefile.PL
#~ make
#~
#~ # Adjust Makefile to use our "fake" root dir to install libraries and also binaries"
#~ cat Makefile | sed -e "s/PREFIX = \/usr/PREFIX = temp_package\/usr/" > Makefile.temp
#~
#~ # This is needed to create .DEB in OpenSUSE.
#~
#~ cat Makefile.temp | sed -e "s/INSTALLBIN = .*/INSTALLBIN = temp_package\/usr\/bin/" > Makefile
#~ cat Makefile | sed -e "s/INSTALLSITEBIN = .*/INSTALLSITEBIN = temp_package\/usr\/bin/" > Makefile.temp
#~ cat Makefile.temp | sed -e "s/INSTALLVENDORBIN = .*/INSTALLVENDORBIN = temp_package\/usr\/bin/" > Makefile
#~ cat Makefile | sed -e "s/INSTALLSCRIPT = .*/INSTALLSCRIPT = temp_package\/usr\/bin/" > Makefile.temp
#~ cat Makefile.temp | sed -e "s/INSTALLSITESCRIPT = .*/INSTALLSITESCRIPT = temp_package\/usr\/bin/" > Makefile
#~ cat Makefile | sed -e "s/INSTALLVENDORSCRIPT = .*/INSTALLVENDORSCRIPT = temp_package\/usr\/bin/" > Makefile.temp
#~
#~ mv Makefile.temp Makefile
#~ make install
#~
#~ echo "Copy other files in fake file."
#~ cp util/pandora_logrotate temp_package/etc/logrotate.d/pandora
#~
#~ cp bin/tentacle_server temp_package/usr/bin
#~ cp util/tentacle_serverd temp_package/etc/init.d/tentacle_serverd
#~
#~ cp conf/pandora_server.conf temp_package/etc/pandora/
#~ cp util/pandora_server temp_package/etc/init.d/
#~
#~ cp -R util temp_package/usr/share/pandora_server
cp -R DEBIAN temp_package/
chmod 755 -R temp_package/DEBIAN

View File

@ -68,8 +68,15 @@ chown -R pandora /var/spool/pandora/
echo "Creating setup directory in /etc/pandora"
mkdir /etc/pandora 2> /dev/null
ln -s /usr/share/pandora_server/conf/pandora_server.conf /etc/pandora/
chmod 770 /etc/pandora/pandora_server.conf
#Check if exist old conf file
count_lines_conf=`cat /etc/pandora/pandora_server.conf | wc -l`
if [ $count_lines_conf -eq 0 ]
then
rm /etc/pandora/pandora_server.conf
ln -s /usr/share/pandora_server/conf/pandora_server.conf /etc/pandora/
chmod 770 /etc/pandora/pandora_server.conf
fi
echo "Linking startup script to /etc/rc2.d"
update-rc.d pandora_server defaults