tiny-slitaz diff step4.php @ rev 29

No hard coded boot menu
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Sep 20 21:20:45 2019 +0200 (2019-09-20)
parents 038499e4d7db
children 974cf6a79cc4
line diff
     1.1 --- a/step4.php	Fri Aug 18 11:32:08 2017 +0200
     1.2 +++ b/step4.php	Fri Sep 20 21:20:45 2019 +0200
     1.3 @@ -34,32 +34,8 @@
     1.4  				$_POST['tmp_dir']); 
     1.5  		unset($pkgs[$key]);
     1.6  		$_POST['toconfigure'] = implode(" ", $pkgs);
     1.7 -		$suggested = shell_exec("./helper --get-suggested $pkg ".
     1.8 -					$_POST['tmp_dir']); 
     1.9 -		if ($suggested != "") {
    1.10 -			$sugghead = <<<EOT
    1.11 -	<hr />
    1.12 -	<p>
    1.13 -	You may want to install the following package(s) too:
    1.14 -	</p>
    1.15 -	<ol>
    1.16 -EOT;
    1.17 -			$checked = "checked=\"checked\" ";
    1.18 -			if (file_exists($_POST["tmp_dir"]."uploadconf")) $checked = "";
    1.19 -			foreach (explode(" ", $suggested) as $sug)
    1.20 -				if (!strstr(" ".$_POST['packages']." ",
    1.21 -				    " ".$sug." ")) {
    1.22 -					$output .= $sugghead ;
    1.23 -					$sugghead = "";
    1.24 -					$output .= <<<EOT
    1.25 -		<li>
    1.26 -		<input type="checkbox" name="suggested[]" value="$sug" $checked/>$sug
    1.27 -		</li>
    1.28 -EOT;
    1.29 -			}
    1.30 -			if ($sugghead == "")
    1.31 -				$output .= "	</ol>\n";
    1.32 -		}
    1.33 +		$output .= shell_exec("./helper --list-suggested $pkg ".
    1.34 +			$_POST['tmp_dir']." ".$_POST['packages']); 
    1.35  		if ($output == "") {
    1.36  			shell_exec("sudo ./helper --post-install $pkg ".
    1.37  				   $_POST['tmp_dir']);