lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Fedora rules

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-02 23:36:32 +02:00
parent 77956a5676
commit 16fbe72f69
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/rpm/dolibarr_fedora.spec
View File

@ -279,18 +279,11 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
# Restart web server # Restart web server
echo Restart web server echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then /sbin/service httpd restart
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
# Restart mysql # Restart mysql server
echo Restart mysql echo Restart mysql server
if [ -f /etc/init.d/mysqld ]; then /sbin/service mysqld restart
/etc/init.d/mysqld restart
fi
# Show result # Show result
echo echo
@ -323,12 +316,7 @@ if [ "x$status" = "xpurge" ] ;
then then
# Restart web server # Restart web server
echo Restart web server echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then /sbin/service httpd restart
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi fi

18
build/rpm/dolibarr_generic.spec
View File

@ -382,7 +382,7 @@ fi
# If a conf already exists and its content was already completed by installer # If a conf already exists and its content was already completed by installer
export config=%{_sysconfdir}/dolibarr/conf.php export config=%{_sysconfdir}/dolibarr/conf.php
if [ -s $config ] && grep -q "File generated by" $config if [ -s $config ] && grep -q "File generated by" $config
then then
# File already exist. We add params not found. # File already exist. We add params not found.
echo Add new params to overwrite path to use shared libraries/fonts echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
@ -447,18 +447,26 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
# Restart web server # Restart web server
echo Restart web server echo Restart web server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service httpd restart
%else
if [ -f %{_sysconfdir}/init.d/httpd ]; then if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart %{_sysconfdir}/init.d/httpd restart
fi fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart %{_sysconfdir}/init.d/apache2 restart
fi fi
%endif
# Restart mysql # Restart mysql server
echo Restart mysql echo Restart mysql server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service mysqld restart
%else
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /etc/init.d/mysqld restart
fi fi
%endif
# Show result # Show result
echo echo
@ -516,12 +524,16 @@ if [ "x$status" = "xpurge" ] ;
then then
# Restart web server # Restart web server
echo Restart web server echo Restart web server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service httpd restart
%else
if [ -f %{_sysconfdir}/init.d/httpd ]; then if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart %{_sysconfdir}/init.d/httpd restart
fi fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart %{_sysconfdir}/init.d/apache2 restart
fi fi
%endif
fi fi