diff --git a/create-iso.sh b/create-iso.sh index 9df26b3c6a3c9e4722afc5240f4ff775510f8268..703002ae0af51ae2f189fa93a63e04c787b5d536 100755 --- a/create-iso.sh +++ b/create-iso.sh @@ -50,22 +50,21 @@ regenerateManifest() chmod +w "$CDDIR"/casper/filesystem.manifest chroot "$CHROOTDIR" dpkg-query -W --showformat='${Package} ${Version}\n' > \ "$CDDIR"/casper/filesystem.manifest - #cp $CDDIR/casper/filesystem.manifest \ - # $CDDIR/casper/filesystem.manifest-desktop - cat "$INSTLIST"-remove >> "$CDDIR"/casper/filesystem.manifest-remove - - #for package in $(cat "$CDDIR"/casper/filesystem.manifest-remove | cut -d '=' -f1 | grep -v "^#"); do - # if ! grep -q "^$package " "$CDDIR"/casper/filesystem.manifest; then - # sed -i "/$package/d" "$CDDIR"/casper/filesystem.manifest-remove - # fi - #done - - #for package in $(cat $INSTLIST-desktop | cut -d '=' -f1 | grep -v "^#"); do - # ( printf "$package "; chroot $CHROOTDIR apt-cache showpkg $package | - # grep "^[0-9]" | tail -n1 | cut -d ' ' -f1 ) >> \ - # $CDDIR/casper/filesystem.manifest-desktop - #done + if [ "$DISTRO" == "Linux_Educacional_4.0" ]; then + cp "$CDDIR"/casper/filesystem.manifest \ + "$CDDIR"/casper/filesystem.manifest-desktop + for package in $(cat "$INSTLIST" | cut -d '=' -f1 | grep -v "^#"); do + sed -i "/$package/d" "$CDDIR"/casper/filesystem.manifest-desktop + done + for pkg in $(cat "$INSTLIST"-desktop | cut -d'=' -f1 | grep -v "^#"); do + ( printf "$pkg "; chroot "$CHROOTDIR" apt-cache showpkg "$pkg" | + grep "^[0-9]" | tail -n1 | cut -d ' ' -f1 ) >> \ + "$CDDIR"/casper/filesystem.manifest-desktop + done + elif [ "$DISTRO" == "Linux_Educacional_5" ]; then + cat "$INSTLIST"-remove >> "$CDDIR"/casper/filesystem.manifest-remove + fi return 0 }