diff --git a/srcpkgs/xbps-mklive/files/xbps-mklive.sh b/srcpkgs/xbps-mklive/files/xbps-mklive.sh index 89fbff597f..b8d30378c6 100644 --- a/srcpkgs/xbps-mklive/files/xbps-mklive.sh +++ b/srcpkgs/xbps-mklive/files/xbps-mklive.sh @@ -154,14 +154,23 @@ if [ ! -f "$ISOLINUX_DIR/vesamenu.c32" ]; then cp -f $SYSLINUX_DATADIR/vesamenu.c32 "$ISOLINUX_DIR" fi -for _pkg_ in ${PACKAGE_LIST}; do - info_msg "Installing ${_pkg_} package..." - xbps-bin.static -r $TEMP_ROOTFS -f install ${_pkg_} +xbps_relver=$(xbps-bin.static -V) +xbps-uhelper.static cmpver ${xbps_relver} 20091222 +if [ $? -eq 255 ]; then + yesflag="-f" + for _pkg_ in ${PACKAGE_LIST}; do + info_msg "Installing ${_pkg_} package..." + xbps-bin.static -r $TEMP_ROOTFS ${yesflag} install ${_pkg_} + [ $? -ne 0 ] && error_out $? + done +else + yesflag="-y" + xbps-bin.static -r $TEMP_ROOTFS ${yesflag} install ${PACKAGE_LIST} [ $? -ne 0 ] && error_out $? -done -xbps-bin.static -r $TEMP_ROOTFS autoupdate || error_out $? -xbps-bin.static -r $TEMP_ROOTFS autoremove || error_out $? -xbps-bin.static -r $TEMP_ROOTFS purge all || error_out $? +fi +xbps-bin.static -r $TEMP_ROOTFS ${yesflag} autoupdate || error_out $? +xbps-bin.static -r $TEMP_ROOTFS ${yesflag} autoremove || error_out $? +xbps-bin.static -r $TEMP_ROOTFS ${yesflag} purge all || error_out $? xbps-bin.static -r $TEMP_ROOTFS list > $BUILD_TMPDIR/packages.txt info_msg "Creating /etc/motd..." diff --git a/srcpkgs/xbps-mklive/template b/srcpkgs/xbps-mklive/template index fd71cd2e68..8ac918cd34 100644 --- a/srcpkgs/xbps-mklive/template +++ b/srcpkgs/xbps-mklive/template @@ -1,6 +1,6 @@ # Template file for 'xbps-mklive' pkgname=xbps-mklive -version=0.1.4 +version=0.1.5 build_style=custom-install short_desc="XBPS Live image maker" maintainer="Juan RP "