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

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-01-04 19:33:55 +01:00
commit 69c4cbd872
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/perl/virtualmin/dolibarr.pl
View File

@ -1,7 +1,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# \file dolibarr.pl # \file dolibarr.pl
# \brief Dolibarr script install for Virtualmin Pro # \brief Dolibarr script install for Virtualmin Pro
# \author (c)2009-2011 Regis Houssin <regis@dolibarr.fr> # \author (c)2009-2012 Regis Houssin <regis@dolibarr.fr>
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -30,7 +30,7 @@ return "Regis Houssin";
# script_dolibarr_versions() # script_dolibarr_versions()
sub script_dolibarr_versions sub script_dolibarr_versions
{ {
return ( "3.1.0" ); return ( "3.1.0", "3.0.1", "2.9.0" );
} }
sub script_dolibarr_category sub script_dolibarr_category
@ -141,7 +141,7 @@ sub script_dolibarr_files
local ($d, $ver, $opts, $upgrade) = @_; local ($d, $ver, $opts, $upgrade) = @_;
local @files = ( { 'name' => "source", local @files = ( { 'name' => "source",
'file' => "Dolibarr_$ver.tar.gz", 'file' => "Dolibarr_$ver.tar.gz",
'url' => "http://www.dolibarr.fr/files/stable/dolibarr-$ver.tar.gz" } ); 'url' => "http://prdownloads.sourceforge.net/dolibarr/dolibarr-$ver.tgz" } );
return @files; return @files;
} }
@ -173,7 +173,7 @@ return (0, "Database connection failed : $dberr") if ($dberr);
# Extract tar file to temp dir and copy to target # Extract tar file to temp dir and copy to target
local $temp = &transname(); local $temp = &transname();
local $err = &extract_script_archive($files->{'source'}, $temp, $d, local $err = &extract_script_archive($files->{'source'}, $temp, $d,
$opts->{'dir'}, undef); $opts->{'dir'}, "dolibarr-$ver/htdocs");
$err && return (0, "Failed to extract source : $err"); $err && return (0, "Failed to extract source : $err");
# Add config file # Add config file
@ -354,8 +354,13 @@ sub script_dolibarr_latest
{ {
local ($ver) = @_; local ($ver) = @_;
if ($ver >= 3.0) { if ($ver >= 3.0) {
return ( "http://sourceforge.net/projects/dolibarr/files/".
"Dolibarr%20ERP-CRM",
"(3\\.[0-9\\.]+)" );
}
elsif ($ver >= 2.9) {
return ( "http://www.dolibarr.fr/files/stable/", return ( "http://www.dolibarr.fr/files/stable/",
"dolibarr\\-(3\\.[0-9\\.]+)" ); "dolibarr\\-(2\\.[0-9\\.]+)" );
} }
return ( ); return ( );
} }