diff --git a/scripts/build.sh b/scripts/build.sh index 69287eca1..8fa912800 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -130,6 +130,7 @@ zap_rootfs() { msg "Extracting tarball image: $TARBALLIMG" tar -xf $TARBALLIMG -C $ROOTFS || die "Error extracting tarball image" tmp_scratchpkgconf + #echo "$RELEASE" > "$ROOTFS"/etc/venom-release unset ZAP } @@ -223,10 +224,6 @@ make_iso() { cp -aR "$PORTSDIR/virootfs" "$ISODIR" chown -R 0:0 "$ISODIR/virootfs" } - [ -d "$PORTSDIR/customize" ] && { - cp -aR "$PORTSDIR/customize" "$ISODIR" - chown -R 0:0 "$ISODIR/customize" - } main_scratchpkgconf copy_ports @@ -425,6 +422,11 @@ main() { tmp_scratchpkgconf msg "Full upgrading..." chrootrun scratch sysup -y --no-backup || die + [ -f $ROOTFS/etc/venom-release ] && { + if [ $(cat $ROOTFS/etc/venom-release) != "$RELEASE" ]; then + msgerr "venom-release $(cat $ROOTFS/etc/venom-release) != $RELEASE" + fi + } } [ "$REVDEP" ] && { diff --git a/scripts/genportscsv.sh b/scripts/genportscsv.sh new file mode 100755 index 000000000..690d1c552 --- /dev/null +++ b/scripts/genportscsv.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +PORTSDIR="$(dirname $(dirname $(realpath $0)))" +SCRIPTDIR="$(dirname $(realpath $0))" + +repo="main multilib nonfree" +portscsv="$SCRIPTDIR/ports.csv" + +echo > $portscsv + +for r in $repo; do + for p in $PORTSDIR/$r/*; do + [ -f $p/spkgbuild ] || continue + . $p/spkgbuild + homepage=$(grep "^# homepage[[:blank:]]*:" $p/spkgbuild | sed 's/^# homepage[[:blank:]]*:[[:blank:]]*//') + description=$(grep "^# description[[:blank:]]*:" $p/spkgbuild | sed 's/^# description[[:blank:]]*:[[:blank:]]*//') + echo "$name,$version-$release,$r,$homepage,\"$description\"" >> $portscsv + done +done + +echo "NAME,VERSION,REPO,HOMEPAGE,DESCRIPTION" > $portscsv.tmp +sort $portscsv >> $portscsv.tmp +mv $portscsv.tmp $portscsv + +exit 0 diff --git a/scripts/ports.csv b/scripts/ports.csv index ff0ed671d..390be5b68 100644 --- a/scripts/ports.csv +++ b/scripts/ports.csv @@ -1,3 +1,5 @@ +NAME,VERSION,REPO,HOMEPAGE,DESCRIPTION + 1password,8.0.34-1,nonfree,https://1password.com,"Password manager and secure wallet " abook,0.6.1-1,main,,"Text-based addressbook designed for use with Mutt " acl,2.3.1-1,main,,"Utilities to administer Access Control Lists, which are used to define more fine-grained discretionary access rights for files and directories" @@ -706,7 +708,6 @@ muparser,2.3.2-1,main,,"A fast math parser library" mupdf,1.18.0-1,main,,"Lightweight PDF and XPS viewer " mypaint-brushes1,1.3.1-1,main,,"Brushes used by packages which use libmypaint" mypaint-brushes,2.0.2-1,main,,"Brushes used by packages which use libmypaint" -NAME,VERSION,REPO,HOMEPAGE,DESCRIPTION nano,4.9.3-1,main,,"Simple text editor which aims to replace Pico, the default editor in the Pine package" nasm,2.15.05-1,main,,"80x86 assembler designed for portability and modularity" nbwmon,0.5.2-1,main,,"ncurses bandwidth monitor" diff --git a/scripts/ports.sh b/scripts/ports.sh index 9ef58e068..4c91f8648 100755 --- a/scripts/ports.sh +++ b/scripts/ports.sh @@ -258,16 +258,16 @@ port_push() { return 2 fi - #echo "generating packagelist" - #$SCRIPTDIR/genpackagelist.sh + echo "generating ports.csv" + $SCRIPTDIR/genportscsv.sh - #git add $SCRIPTDIR/packages.json + git add $SCRIPTDIR/ports.csv for r in ${PORTREPO[@]}; do git add $r done - #git commit -m "REPO updated" + git commit -m "REPO updated" git push }