Fix use of dolibarr_main_distrib

build/debian/conf.php.install

@@ -232,7 +232,7 @@ $dolibarr_main_prod='0';
 # Examples:
 # $dolibarr_mailing_limit_sendbycli='0';
 
-# dolibarr_distrib
+# dolibarr_main_distrib
 # A key to identify the distribution used for first installation
-$dolibarr_distrib = 'deb';
+$dolibarr_main_distrib = 'debian';
 

build/debian/install.forced.php.install

@@ -24,6 +24,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='debian';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
 // If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 

build/exe/doliwamp/install.forced.php.install

@@ -22,6 +22,7 @@ $force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='644';
+$force_install_distrib='doliwamp';
 
 $force_install_module='';
 ?>

build/rpm/install.forced.php.fedora

@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmfedora';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';

build/rpm/install.forced.php.generic

@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmgeneric';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 // We don't force any external lib with generic package

build/rpm/install.forced.php.mandriva

@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmmandriva';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';

build/rpm/install.forced.php.opensuse

@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmopensuse';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';

htdocs/install/step1.php

@@ -64,6 +64,8 @@ $main_use_alt_dir = ((GETPOST("main_use_alt_dir", 'alpha') == '' || (GETPOST("ma
 // Alternative root directory name
 $main_alt_dir_name = ((GETPOST("main_alt_dir_name", 'alpha') && GETPOST("main_alt_dir_name", 'alpha') != '') ? GETPOST("main_alt_dir_name", 'alpha') : 'custom');
 
+$dolibarr_main_distrib = 'standard';
+
 session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
 
 // Save a flag to tell to restore input value if we go back
@@ -127,6 +129,10 @@ if (@file_exists($forcedfile)) {
 			$main_force_https = $force_install_mainforcehttps;
 		}
 	}
+
+	if (!empty($force_install_distrib)) {
+		$dolibarr_main_distrib = $force_install_distrib;
+	}
 }
 
 
@@ -833,6 +839,7 @@ function write_conf_file($conffile)
     global $dolibarr_main_url_root, $dolibarr_main_document_root, $dolibarr_main_data_root, $dolibarr_main_db_host;
     global $dolibarr_main_db_port, $dolibarr_main_db_name, $dolibarr_main_db_user, $dolibarr_main_db_pass;
     global $dolibarr_main_db_type, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_authentication;
+    global $dolibarr_main_distrib;
     global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation;
     global $conffile, $conffiletoshow, $conffiletoshowshort;
     global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
@@ -900,7 +907,7 @@ function write_conf_file($conffile)
 		fputs($fp, '$dolibarr_main_db_collation=\''.str_replace("'", "\'", trim($db_collation)).'\';');
 		fputs($fp, "\n");
 
-		/* Authentication */
+		// Authentication
 		fputs($fp, '// Authentication settings');
         fputs($fp, "\n");
 
@@ -980,6 +987,10 @@ function write_conf_file($conffile)
         fputs($fp, "\n");
         if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; }
         fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
+        fputs($fp, "\n");
+
+        // Other
+        fputs($fp, '$dolibarr_main_distrib=\''.str_replace("'", "\'", trim($dolibarr_main_distrib)).'\';');
         fputs($fp, "\n");
 
 		fclose($fp);