SliTaz Repositories

     1.1 --- a/web/pkgs.cgi	Tue Mar 27 00:24:50 2012 +0200
     1.2 +++ b/web/pkgs.cgi	Tue Mar 27 00:45:40 2012 +0200
     1.3 @@ -14,7 +14,8 @@
     1.4  log="$tmpdir/slitaz-$id/distro.log"
     1.5  allpkgs="$SLITAZ/$SLITAZ_VERSION/packages/packages.desc"
     1.6  # Flavor pkgs list format: pkgname version " short desc "
     1.7 -list="$tmpdir/slitaz-$id/packages.desc"
     1.8 +list="$tmpdir/slitaz-$id/packages.list"
     1.9 +desc="$tmpdir/slitaz-$id/packages.desc"
    1.10  
    1.11  #
    1.12  # Functions
    1.13 @@ -83,7 +84,8 @@
    1.14  				name=$(echo $pkginfo | cut -d "|" -f 1)
    1.15  				vers=$(echo $pkginfo | cut -d "|" -f 2)
    1.16  				desc=$(echo $pkginfo | cut -d "|" -f 3)
    1.17 -				echo "$name $vers \" $desc \"" >> $list
    1.18 +				echo "$name $vers \" $desc \"" >> $desc
    1.19 +				echo "$name" >> $list
    1.20  			fi
    1.21  		done ;;
    1.22  	*\ rm\ *)
    1.23 @@ -92,6 +94,7 @@
    1.24  		pkgs=$(echo $cmdline | sed -e s'/+/ /g' -e s'/pkg=//g' -e s/$cmd//)
    1.25  		for pkg in $pkgs
    1.26  		do
    1.27 +			sed -i "/^${pkg} /"d $desc
    1.28  			sed -i "/^${pkg} /"d $list
    1.29  		done ;;
    1.30  	*)
    1.31 @@ -104,15 +107,17 @@
    1.32  		[ ! "$desc" ] && echo "Missing short desciption" && exit 0
    1.33  		notify "$(gettext "Creating receipt and packages list")"
    1.34  		mkdir -p $tmpdir/slitaz-$id
    1.35 +		# Use a pkg desc for the web interface and a simple one tazlito.
    1.36  		cp -f $hgflavors/$skel/packages.desc $list
    1.37 -		echo "Receipt created : $(date '+%Y-%m-%d %H:%M')" > $log
    1.38 +		cp -f $hgflavors/$skel/packages.list $tmpdir/slitaz-$id/packages.list
    1.39  		empty_receipt
    1.40  		sed -i \
    1.41  			-e s"/FLAVOR=.*/FLAVOR=\"slitaz-$flavor\"/" \
    1.42  			-e s"/MAINTAINER=.*/MAINTAINER=\"$mail\"/" \
    1.43  			-e s"/SKEL=.*/SKEL=\"$skel\"/" \
    1.44  			-e s"/SHORT_DESC=.*/SHORT_DESC=\"$desc\"/" \
    1.45 -			-e s"/ID=.*/ID=\"$id\"/" $tmpdir/slitaz-$id/receipt ;;
    1.46 +			-e s"/ID=.*/ID=\"$id\"/" $tmpdir/slitaz-$id/receipt 
    1.47 +		echo "Receipt created : $(date '+%Y-%m-%d %H:%M')" > $log ;;
    1.48  esac
    1.49  
    1.50  #
    1.51 @@ -124,7 +129,6 @@
    1.52  cat << EOT
    1.53  <h2>Packages ($nb)</h2>
    1.54  
    1.55 -
    1.56  <form method="get" action="pkgs.cgi">
    1.57  	<div id="packages">
    1.58  	<table>