diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst index 3f83dfede1d..92112e29e50 100644 --- a/build/debian/dolibarr.postinst +++ b/build/debian/dolibarr.postinst @@ -94,17 +94,17 @@ case "$1" in else # 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/dolibarr/htdocs/includes/adodbtime" ] || echo "" >> $config - grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ -d "/usr/share/dolibarr/htdocs/includes/fpdfi" ] || echo "" >> $config - #grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "" >> $config - grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ -d "/usr/share/dolibarr/htdocs/includes/nusoap" ] || echo "" >> $config - grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip ] || echo "" >> $config - #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "" >> $config - #grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "" >> $config - grep -q -c "dolibarr_js_CKEDITOR" $config || [ -d "/usr/share/dolibarr/htdocs/includes/ckeditor" ] || echo "" >> $config - grep -q -c "dolibarr_js_JQUERY" $config || [ -d "/usr/share/dolibarr/htdocs/includes/jquery/js" ] || echo "" >> $config - grep -q -c "dolibarr_js_JQUERY_UI" $config || [ -d "/usr/share/dolibarr/htdocs/includes/jquery/js" ] || echo "" >> $config - grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ -d "/usr/share/dolibarr/htdocs/includes/jquery/plugins/flot" ] || echo "" >> $config + grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "" >> $config + grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "" >> $config + #grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "" >> $config + grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "" >> $config + grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "" >> $config + #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "" >> $config + #grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "" >> $config + grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "" >> $config + grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "" >> $config + grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "" >> $config + grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "" >> $config grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "" >> $config fi diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 09952889c6f..7b1a56f33da 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -672,7 +672,7 @@ if ($nboftargetok) { #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; print "Launch DEB build ($cmd)\n"; - $ret=`$cmd`; + $ret=`$cmd 2>&1 3>&1`; print $ret."\n"; chdir("$olddir");