Fix files that should not mix tab and spaces indent.

build/rpm/dolibarr_fedora.spec

@@ -117,9 +117,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -238,20 +238,20 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-	# File already exist. We add params not found.
-	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_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
-	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+  # File already exist. We add params not found.
+  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_FPDI_PATH" $config      || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+  grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 fi
 
 # Create config for SE Linux
@@ -264,13 +264,13 @@ restorecon -R -v /var/lib/dolibarr
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    apachelinkdir=`dirname $apachelink`
-    if [ -d $apachelinkdir ]; then
-        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-    else
-        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-    fi
+  apachelinkdir=`dirname $apachelink`
+  if [ -d $apachelinkdir ]; then
+    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+  else
+    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+  fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -302,30 +302,30 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-	# Remove
-	echo "Removed package"
-
-	# Define vars
-	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-	
-	# Remove apache link
-	if [ -L $apachelink ] ;
-	then
-	    echo "Delete apache config link for Dolibarr ($apachelink)"
-	    %{__rm} -f $apachelink
-	    status=purge
-	fi
-	
-	# Restart web servers if required
-	if [ "x$status" = "xpurge" ] ;
-	then
-	    # Restart web server
-	    echo Restart web server
-	    /sbin/service httpd restart
-	fi
+  # Remove
+  echo "Removed package"
+
+  # Define vars
+  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  
+  # Remove apache link
+  if [ -L $apachelink ] ;
+  then
+    echo "Delete apache config link for Dolibarr ($apachelink)"
+    %{__rm} -f $apachelink
+    status=purge
+  fi
+  
+  # Restart web servers if required
+  if [ "x$status" = "xpurge" ] ;
+  then
+    # Restart web server
+    echo Restart web server
+    /sbin/service httpd restart
+  fi
 else
-	# Upgrade
-	echo "No remove action done (this is an upgrade)"
+  # Upgrade
+  echo "No remove action done (this is an upgrade)"
 fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release

build/rpm/dolibarr_generic.spec

@@ -190,9 +190,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -323,28 +323,28 @@ export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 # Detect OS
 os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
+  export os='fedora-redhat';
+  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  export apacheuser='apache';
+  export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-    export os='opensuse';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='wwwrun';
-    export apachegroup='www';
+  export os='opensuse';
+  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+  export apacheuser='wwwrun';
+  export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
+  export os='mageia-mandriva';
+  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  export apacheuser='apache';
+  export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='www-data';
-    export apachegroup='www-data';
+  export os='ubuntu-debian';
+  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+  export apacheuser='www-data';
+  export apachegroup='www-data';
 fi
 echo OS detected: $os
 %endif
@@ -363,16 +363,16 @@ echo Create document directory $docdir
 # Create install.forced.php into Dolibarr install directory
 if [ "x$os" = "xubuntu-debian" ]
 then
-	superuserlogin=''
-	superuserpassword=''
-	if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
-	    # Load superuser login and pass
-	    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
-	    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
-	fi
-	echo Mysql superuser found to use is $superuserlogin
-	%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
-	%{__chmod} -R 660 $installconfig
+  superuserlogin=''
+  superuserpassword=''
+  if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
+    # Load superuser login and pass
+    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+  fi
+  echo Mysql superuser found to use is $superuserlogin
+  %{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+  %{__chmod} -R 660 $installconfig
 fi
 %endif
 
@@ -383,29 +383,29 @@ fi
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then
-	# File already exist. We add params not found.
-	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_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
-	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+  # File already exist. We add params not found.
+  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_FPDI_PATH" $config      || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+  grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 %else
 %if 0%{?mdkversion}
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 %else
 %if 0%{?suse_version}
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config			
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
 %else
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 %endif
 %endif
 %endif
@@ -418,12 +418,12 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
 %endif
 %if 0%{?mdkversion} || 0%{?suse_version}
 %else
-    echo Add SE Linux permissions for dolibarr
-    # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-    semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
-    semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
-    restorecon -R -v /etc/dolibarr
-    restorecon -R -v /var/lib/dolibarr
+  echo Add SE Linux permissions for dolibarr
+  # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
+  semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
+  restorecon -R -v /etc/dolibarr
+  restorecon -R -v /var/lib/dolibarr
 %endif
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
 %else
@@ -432,13 +432,13 @@ fi
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    apachelinkdir=`dirname $apachelink`
-    if [ -d $apachelinkdir ]; then
-        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-    else
-        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-    fi
+  apachelinkdir=`dirname $apachelink`
+  if [ -d $apachelinkdir ]; then
+    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+      ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+  else
+    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+  fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -451,30 +451,30 @@ echo Restart web server
 /sbin/service httpd restart
 %else
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
+  %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
+  %{_sysconfdir}/init.d/apache2 restart
 fi
 %endif
 
 # Restart mysql server
 echo Restart mysql server
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-	/sbin/service mysqld restart
+  /sbin/service mysqld restart
 %else
 %if 0%{?suse_version}
 if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
+  /etc/init.d/mysqld restart
 else
-	/sbin/service mysql restart
+  /sbin/service mysql restart
 fi
 %else
 if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
+  /etc/init.d/mysqld restart
 fi
 if [ -f /etc/init.d/mysql ]; then
-    /etc/init.d/mysql restart
+  /etc/init.d/mysql restart
 fi
 %endif
 %endif
@@ -497,63 +497,63 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-	# Remove
-	echo "Removed package"
-
-	# Define vars
-	os='unknown';
-	%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-	%else
-	%if 0%{?suse_version}
-	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-	%else
-	if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-	    export os='fedora-redhat';
-	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-	fi
-	if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-	    export os='opensuse';
-	    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-	fi
-	if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-	    export os='mageia-mandriva';
-	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-	fi
-	if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-	    export os='ubuntu-debian';
-	    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-	fi
-	%endif
-	%endif
-	
-	# Remove apache link
-	if [ -L $apachelink ] ;
-	then
-	    echo "Delete apache config link for Dolibarr ($apachelink)"
-	    %{__rm} -f $apachelink
-	    status=purge
-	fi
-	
-	# Restart web servers if required
-	if [ "x$status" = "xpurge" ] ;
-	then
-	    # 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
-	        %{_sysconfdir}/init.d/httpd restart
-	    fi
-	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-	        %{_sysconfdir}/init.d/apache2 restart
-	    fi
-	    %endif
-	fi
+  # Remove
+  echo "Removed package"
+
+  # Define vars
+  os='unknown';
+  %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  %else
+  %if 0%{?suse_version}
+  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+  %else
+  if [ -d %{_sysconfdir}/httpd/conf.d ]; then
+    export os='fedora-redhat';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  fi
+  if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+    export os='opensuse';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+  fi
+  if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+    export os='mageia-mandriva';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  fi
+  if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
+    export os='ubuntu-debian';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+  fi
+  %endif
+  %endif
+  
+  # Remove apache link
+  if [ -L $apachelink ] ;
+  then
+    echo "Delete apache config link for Dolibarr ($apachelink)"
+    %{__rm} -f $apachelink
+    status=purge
+  fi
+  
+  # Restart web servers if required
+  if [ "x$status" = "xpurge" ] ;
+  then
+    # 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
+        %{_sysconfdir}/init.d/httpd restart
+      fi
+      if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+        %{_sysconfdir}/init.d/apache2 restart
+      fi
+      %endif
+  fi
 else
-	# Upgrade
-	echo "No remove action done (this is an upgrade)"
+  # Upgrade
+  echo "No remove action done (this is an upgrade)"
 fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release

build/rpm/dolibarr_mandriva.spec

@@ -114,9 +114,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -235,31 +235,31 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-	# File already exist. We add params not found.
-	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_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
-	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+  # File already exist. We add params not found.
+  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_FPDI_PATH" $config      || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+  grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 fi
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    apachelinkdir=`dirname $apachelink`
-    if [ -d $apachelinkdir ]; then
-        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-    else
-        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-    fi
+  apachelinkdir=`dirname $apachelink`
+  if [ -d $apachelinkdir ]; then
+    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+  else
+    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+  fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -269,19 +269,19 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
+  %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
+  %{_sysconfdir}/init.d/apache2 restart
 fi
 
 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
+  /etc/init.d/mysqld restart
 fi
 if [ -f /etc/init.d/mysql ]; then
-    /etc/init.d/mysql restart
+  /etc/init.d/mysql restart
 fi
 
 # Show result
@@ -301,35 +301,35 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-	# Remove
-	echo "Removed package"
-
-	# Define vars
-	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-	
-	# Remove apache link
-	if [ -L $apachelink ] ;
-	then
-	    echo "Delete apache config link for Dolibarr ($apachelink)"
-	    %{__rm} -f $apachelink
-	    status=purge
-	fi
-	
-	# Restart web servers if required
-	if [ "x$status" = "xpurge" ] ;
-	then
-	    # Restart web server
-	    echo Restart web server
-	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-	        %{_sysconfdir}/init.d/httpd restart
-	    fi
-	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-	        %{_sysconfdir}/init.d/apache2 restart
-	    fi
-	fi
+  # Remove
+  echo "Removed package"
+
+  # Define vars
+  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+  
+  # Remove apache link
+  if [ -L $apachelink ] ;
+  then
+    echo "Delete apache config link for Dolibarr ($apachelink)"
+    %{__rm} -f $apachelink
+    status=purge
+  fi
+  
+  # Restart web servers if required
+  if [ "x$status" = "xpurge" ] ;
+  then
+    # Restart web server
+    echo Restart web server
+    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+      %{_sysconfdir}/init.d/httpd restart
+    fi
+    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+      %{_sysconfdir}/init.d/apache2 restart
+    fi
+  fi
 else
-	# Upgrade
-	echo "No remove action done (this is an upgrade)"
+  # Upgrade
+  echo "No remove action done (this is an upgrade)"
 fi
 
 

build/rpm/dolibarr_opensuse.spec

@@ -115,9 +115,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -246,31 +246,31 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-	# File already exist. We add params not found.
-	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_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
-	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config			
+  # File already exist. We add params not found.
+  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_FPDI_PATH" $config      || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+  grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config      
 fi
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    apachelinkdir=`dirname $apachelink`
-    if [ -d $apachelinkdir ]; then
-        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-    else
-        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-    fi
+  apachelinkdir=`dirname $apachelink`
+  if [ -d $apachelinkdir ]; then
+    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+  else
+    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+  fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -280,18 +280,18 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
+  %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
+  %{_sysconfdir}/init.d/apache2 restart
 fi
 
 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
+  /etc/init.d/mysqld restart
 else
-	/sbin/service mysql restart
+  /sbin/service mysql restart
 fi
 
 # Show result
@@ -311,35 +311,35 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-	# Remove
-	echo "Removed package"
-	
-	# Define vars
-	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-	
-	# Remove apache link
-	if [ -L $apachelink ] ;
-	then
-	    echo "Delete apache config link for Dolibarr ($apachelink)"
-	    %{__rm} -f $apachelink
-	    status=purge
-	fi
-	
-	# Restart web servers if required
-	if [ "x$status" = "xpurge" ] ;
-	then
-	    # Restart web server
-	    echo Restart web server
-	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-	        %{_sysconfdir}/init.d/httpd restart
-	    fi
-	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-	        %{_sysconfdir}/init.d/apache2 restart
-	    fi
-	fi
+  # Remove
+  echo "Removed package"
+  
+  # Define vars
+  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+  
+  # Remove apache link
+  if [ -L $apachelink ] ;
+  then
+    echo "Delete apache config link for Dolibarr ($apachelink)"
+    %{__rm} -f $apachelink
+    status=purge
+  fi
+  
+  # Restart web servers if required
+  if [ "x$status" = "xpurge" ] ;
+  then
+    # Restart web server
+    echo Restart web server
+    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+      %{_sysconfdir}/init.d/httpd restart
+    fi
+    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+      %{_sysconfdir}/init.d/apache2 restart
+    fi
+  fi
 else
-	# Upgrade
-	echo "No remove action done (this is an upgrade)"
+  # Upgrade
+  echo "No remove action done (this is an upgrade)"
 fi
 
 

dev/fixnotabfiles.sh

+#!/bin/sh
+#------------------------------------------------------
+# Script to find files that are not Unix encoded
+#
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: fixnotabfiles.sh [list|fix]
+#------------------------------------------------------
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Usage: fixnotabfiles.sh [list|fix]"
+fi
+
+# To detec
+if [ "x$1" = "xlist" ]
+then
+	find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
+fi
+
+# To convert
+if [ "x$1" = "xfix" ]
+then
+	echo Feature not implemented. Please fix files manually.
+fi