tiny-slitaz rev 35

helper: fix /etc/packages.conf
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 13 15:37:38 2021 +0000 (2021-07-13)
parents d968049fa2bd
children 49e3141e5899
files helper index.php step5.php
line diff
     1.1 --- a/helper	Fri Feb 28 18:38:34 2020 +0100
     1.2 +++ b/helper	Tue Jul 13 15:37:38 2021 +0000
     1.3 @@ -351,12 +351,13 @@
     1.4  	pkg=$(get_receipt $1 $2)
     1.5  	[ -n "$pkg" ] || exit
     1.6  	. $pkg
     1.7 +	[ -d $2/fs/etc ] || mkdir -p $2/fs/etc
     1.8  	echo "$1 $VERSION $(md5sum $(dirname $pkg)/fs.cpio.lzma | awk '{ print $1 }')" >> $2/fs/etc/packages.conf
     1.9  	if grep -qs ^post_install $pkg; then
    1.10  		[ -s $2/vars ] && . $2/vars
    1.11  		echo "=== $pkg: $(date) ===" >> $2/post_install.log 2>&1
    1.12  		post_install $2/fs >> $2/post_install.log 2>&1
    1.13 -		sed -e 's/^export/ /' -e 's/^/  /' -e '/^   suggested=/d' \
    1.14 +		sed -e 's/^export/ /' -e 's/^/  /' -e '/^   suggested=/d' -e '/EXTRA_SUGGESTED=/d' \
    1.15  			< $2/vars >> $2/fs/etc/packages.conf
    1.16  	fi
    1.17  	rm -f $2/vars
     2.1 --- a/index.php	Fri Feb 28 18:38:34 2020 +0100
     2.2 +++ b/index.php	Tue Jul 13 15:37:38 2021 +0000
     2.3 @@ -1,4 +1,4 @@
     2.4 -<?php
     2.5 +<?php	// needs 'www ALL=NOPASSWD: /path/to/helper' in /etc/sudoers
     2.6  include "download.php";
     2.7  $static = "http://mirror1.slitaz.org/static/";
     2.8  ?>
     3.1 --- a/step5.php	Fri Feb 28 18:38:34 2020 +0100
     3.2 +++ b/step5.php	Tue Jul 13 15:37:38 2021 +0000
     3.3 @@ -28,13 +28,26 @@
     3.4        if (!file_exists($_POST['tmp_dir']."out")) 
     3.5  	   shell_exec("sudo ./helper --mkimg ".$_POST['tmp_dir']);
     3.6        if (!isset($_POST['fdsize'])) $_POST['fdsize']="1474560";
     3.7 -      foreach(array("737280" => "720K", "1228800" => "1.2M",
     3.8 -		    "1474560" => "1.44M", "1720320" => "1.68M",
     3.9 -		    "1966080" => "1.92M", "2949120" => "2.88M") as $sz => $nm) {
    3.10 +      $use_optgroup=0;
    3.11 +      foreach(array("360K 5¼-inch" => "", "368640" => "360K", "409600" => "400K",
    3.12 +		    "720K 3½-inch" => "", "737280" => "720K", "819200" => "800K",
    3.13 +      		    "1.2M 5¼-inch" => "", "1228800" => "1.2M",
    3.14 +      		    "1.44M 3½-inch" => "", "1474560" => "1.44M", "1720320" => "1.68M",
    3.15 +		    "1966080" => "1.92M", 
    3.16 +		    "2.88M 3½-inch" => "", "2949120" => "2.88M", "5898240" => "3.36M") as $sz => $nm) {
    3.17 +	if ($nm == "") {
    3.18 +	  if ($use_optgroup != 0) echo "		</optgroup>\n";
    3.19 +	  echo "		<optgroup label=\"$sz\">\n";
    3.20 +	  $use_optgroup=1;
    3.21 +	}
    3.22 +	else {
    3.23  	  echo "		<option value=\"$sz\"";
    3.24  	  if ($sz == $_POST['fdsize']) echo " selected";
    3.25  	  echo ">$nm</option>\n";
    3.26 -      } ?>
    3.27 +	}
    3.28 +      }
    3.29 +      if ($use_optgroup != 0) echo "		</optgroup>\n";
    3.30 +      ?>
    3.31  		</select>
    3.32  		</div>
    3.33  		<input name="download" value="DOS/EXE" type="submit"