Fixed #858: Task - Remove php5-adodb package

Small fixes
i-MSCP · Jul 30, 2013 · 2ca517e · 2ca517e
1 parent cf122dd
commit 2ca517e
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 106 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,9 @@
 Git Master
 ------------------------------------------------------------------------------------------------------------------------
 
+SETUP:
+	- Removed php5-adodb package from distribution packages files
+
 ENGINE:
 	- Fixed: Plugin module is broken: Unable to disable, uninstall... any plugin
 
@@ -13,6 +16,7 @@ Tickets:
 	- Fixed #834: Cosmetics - Ticket system menu names
 	- Fixed #835: Task - Migration script - ispCP - Remove old php5-fcgi-starter
 	- Fixed #852: Bug - Software installer - Unable to install any software
+	- Fixed #858: Task - Remove php5-adodb package
 
 ------------------------------------------------------------------------------------------------------------------------
 1.1.0-rc3

diff --git a/autoinstaller/Common.pm b/autoinstaller/Common.pm
@@ -50,8 +50,7 @@ use parent 'Exporter';
 our @EXPORT = qw(
 	loadConfig installPreRequiredPackages checkDistribution preBuild uninstallPackages installPackages
 	testRequirements processDistroLayoutFile processDistroInstallFiles buildImscpDaemon installEngine installGui
-	installDistMaintainerScripts postBuild doImscpBackup savePersistentData installTmp removeTmp
-	checkCommandAvailability
+	postBuild doImscpBackup savePersistentData installTmp removeTmp checkCommandAvailability
 );
 
 =head1 DESCRIPTION
@@ -526,112 +525,109 @@ sub savePersistentData
 	my ($stdout, $stderr);
 	my $destdir = $main::{'INST_PREF'};
 
-	if(! -d "$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent") {
+	#
+	## i-MSCP version prior 1.0.4
+	#
 
-		#
-		## i-MSCP version prior 1.0.4
-		#
-
-		# save isp logos
-		if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/themes/user_logos") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/themes/user_logos " .
-				"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent/ispLogos", \$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
-	} else {
-		#
-		## i-MSCP version >= 1.0.4
-		#
-
-		# Save Web directories skeletons
-		if(-d "$main::imscpConfig{'CONF_DIR'}/apache/skel") {
-			if(-l "$main::imscpConfig{'CONF_DIR'}/apache/skel/subdomain/htdocs") {
-				$rs = iMSCP::File->new(
-					'filename' => "$main::imscpConfig{'CONF_DIR'}/apache/skel/subdomain/htdocs"
-				)->delFile();
-				return $rs if $rs;
-			}
+	# Save ISP logos
+	if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/themes/user_logos") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/themes/user_logos " .
+			"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent/ispLogos", \$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'CONF_DIR'}/apache/skel " .
-				"$destdir$main::imscpConfig{'CONF_DIR'}/apache/skel", \$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	#
+	## i-MSCP version >= 1.0.4
+	#
+
+	# Save Web directories skeletons
+	if(-d "$main::imscpConfig{'CONF_DIR'}/apache/skel") {
+		#if(-l "$main::imscpConfig{'CONF_DIR'}/apache/skel/subdomain/htdocs") {
+		#	$rs = iMSCP::File->new(
+		#		'filename' => "$main::imscpConfig{'CONF_DIR'}/apache/skel/subdomain/htdocs"
+		#	)->delFile();
+		#	return $rs if $rs;
+		#}
+
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'CONF_DIR'}/apache/skel " .
+			"$destdir$main::imscpConfig{'CONF_DIR'}/apache/skel", \$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-		# Save GUI logs
-		if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/logs") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/data/logs " .
-				"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/logs", \$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	# Save GUI logs
+	if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/logs") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/data/logs " .
+			"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/logs", \$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-		# Save persistent data
-		if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/data/persistent " .
-				"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent", \$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	# Save persistent data
+	if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/data/persistent " .
+			"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent", \$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-		# save isp logos
-		if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/ispLogos") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -TRf $main::imscpConfig{'ROOT_DIR'}/gui/data/ispLogos " .
-				"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent/ispLogos", \$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	# save isp logos
+	if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/ispLogos") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -TRf $main::imscpConfig{'ROOT_DIR'}/gui/data/ispLogos " .
+			"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent/ispLogos", \$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-		# Save softwares
-		if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/softwares") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -TRf $main::imscpConfig{'ROOT_DIR'}/gui/data/softwares " .
-				"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent/softwares", \$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	# Save softwares (older path ./gui/data/softwares) to new path (./gui/data/persistent/softwares)
+	if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/data/softwares") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -TRf $main::imscpConfig{'ROOT_DIR'}/gui/data/softwares " .
+			"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/data/persistent/softwares", \$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-		# Save GUI plugins
-		if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/plugins") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/plugins " .
-				"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/plugins",
-				\$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	# Save GUI plugins
+	if(-d "$main::imscpConfig{'ROOT_DIR'}/gui/plugins") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ROOT_DIR'}/gui/plugins " .
+			"$destdir$main::imscpConfig{'ROOT_DIR'}/gui/plugins",
+			\$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
+	}
 
-		# Save backend plugins
-		if(-d "$main::imscpConfig{'ENGINE_ROOT_DIR'}/Plugins") {
-			$rs = execute(
-				"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ENGINE_ROOT_DIR'}/Plugins " .
-				"$destdir$main::imscpConfig{'ENGINE_ROOT_DIR'}/Plugins",
-				\$stdout, \$stderr
-			);
-			debug($stdout) if $stdout;
-			error($stderr) if $stderr && $rs;
-			return $rs if $rs;
-		}
+	# Save backend plugins
+	if(-d "$main::imscpConfig{'ENGINE_ROOT_DIR'}/Plugins") {
+		$rs = execute(
+			"$main::imscpConfig{'CMD_CP'} -fRT $main::imscpConfig{'ENGINE_ROOT_DIR'}/Plugins " .
+			"$destdir$main::imscpConfig{'ENGINE_ROOT_DIR'}/Plugins",
+			\$stdout, \$stderr
+		);
+		debug($stdout) if $stdout;
+		error($stderr) if $stderr && $rs;
+		return $rs if $rs;
 	}
 
 	0;

diff --git a/docs/Debian/packages-squeeze.xml b/docs/Debian/packages-squeeze.xml
@@ -130,7 +130,6 @@
         <package>php5</package>
         <package>php5-cli</package>
         <package>php-pear</package>
-        <package>php5-adodb</package>
         <package>php5-gd</package>
         <package>php-gettext</package>
         <package>php5-intl</package>

diff --git a/docs/Debian/packages-wheezy.xml b/docs/Debian/packages-wheezy.xml
@@ -105,7 +105,6 @@
         <package>php5</package>
         <package>php5-cli</package>
         <package>php-pear</package>
-        <package>php5-adodb</package>
         <package>php5-gd</package>
         <package>php-gettext</package>
         <package>php5-intl</package>

diff --git a/docs/Ubuntu/packages-lucid.xml b/docs/Ubuntu/packages-lucid.xml
@@ -112,7 +112,6 @@
         <package>php5</package>
         <package>php5-cli</package>
         <package>php-pear</package>
-        <package>php5-adodb</package>
         <package>php5-gd</package>
         <package>php-gettext</package>
         <package>php5-intl</package>

diff --git a/docs/Ubuntu/packages-precise.xml b/docs/Ubuntu/packages-precise.xml
@@ -106,7 +106,6 @@
         <package>php5</package>
         <package>php5-cli</package>
         <package>php-pear</package>
-        <package>php5-adodb</package>
         <package>php5-gd</package>
         <package>php-gettext</package>
         <package>php5-intl</package>

diff --git a/docs/Ubuntu/packages-quantal.xml b/docs/Ubuntu/packages-quantal.xml
@@ -107,7 +107,6 @@
         <package>php5-cli</package>
         <package>php-pear</package>
         <package>php5</package>
-        <package>php5-adodb</package>
         <package>php5-gd</package>
         <package>php-gettext</package>
         <package>php5-intl</package>

diff --git a/docs/Ubuntu/packages-raring.xml b/docs/Ubuntu/packages-raring.xml
@@ -107,7 +107,6 @@
         <package>php5-cli</package>
         <package>php-pear</package>
         <package>php5</package>
-        <package>php5-adodb</package>
         <package>php5-gd</package>
         <package>php-gettext</package>
         <package>php5-intl</package>