Major infrastructure changes, part 2.
* Moved helpers, common and triggers dirs into xbps-src, where they belong. * Renamed the templates dir to srcpkgs, it was so redundant before. * Make it possible to add subpkgs with no restriction in names, for example udev now has a subpkgs called "libgudev". Previously subpkgs were named "${sourcepkg}-${pkgname}". * xbps-src: changed to look for template files in current directory. That means that most arguments from the targets have been removed. * xbps-src: added a reinstall target, to remove + install. * xbps-src: do not overwrite binpkgs by default, skip them. And more that I forgot because it's a mega-commit that I've been working for some days already... --HG-- extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
This commit is contained in:
@@ -191,9 +191,9 @@ _EOF
|
||||
case "$action" in
|
||||
install)
|
||||
if [ -n "${sourcepkg}" -a "${sourcepkg}" != "${pkgname}" ]; then
|
||||
install_file=${XBPS_TEMPLATESDIR}/${pkgname}/${pkgname}.INSTALL
|
||||
install_file=$XBPS_SRCPKGDIR/$pkgname/$pkgname.INSTALL
|
||||
else
|
||||
install_file=${XBPS_TEMPLATESDIR}/${pkgname}/INSTALL
|
||||
install_file=$XBPS_SRCPKGDIR/$pkgname/INSTALL
|
||||
fi
|
||||
if [ -f ${install_file} ]; then
|
||||
found=1
|
||||
@@ -208,9 +208,9 @@ _EOF
|
||||
;;
|
||||
remove)
|
||||
if [ -n "${sourcepkg}" -a "${sourcepkg}" != "${pkgname}" ]; then
|
||||
remove_file=${XBPS_TEMPLATESDIR}/${pkgname}/${pkgname}.REMOVE
|
||||
remove_file=$XBPS_SRCPKGDIR/$pkgname/$pkgname.REMOVE
|
||||
else
|
||||
remove_file=${XBPS_TEMPLATESDIR}/${pkgname}/REMOVE
|
||||
remove_file=$XBPS_SRCPKGDIR/$pkgname/REMOVE
|
||||
fi
|
||||
if [ -f ${remove_file} ]; then
|
||||
found=1
|
||||
|
Reference in New Issue
Block a user