Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4308ff6
Run post install after finish the packages
Baptiste Daroussin committed 10 years ago
commit 4308ff60656ea6ed3b112f4bd74df488505411f3
parent 0527400
1 file changed +18 -17
modified libpkg/pkg_add.c
@@ -907,29 +907,30 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
	/* Update configuration file content with db with newer versions */

	pkgdb_update_config_file_content(pkg, db->sqlite);
+ 
	retcode = pkg_extract_finalize(pkg);
+ 
cleanup_reg:
+ 
	pkgdb_register_finale(db, retcode);

	/*

	 * Execute post install scripts

	 */
- 
	if ((flags & PKG_ADD_NOSCRIPT) == 0) {
- 
		if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS)
- 
			pkg_script_run(pkg, PKG_SCRIPT_POST_UPGRADE);
- 
		else
- 
			pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL);
- 
	}
- 
	/*
- 
	 * start the different related services if the users do want that
- 
	 * and that the service is running
- 
	 */
-
- 
	handle_rc = pkg_object_bool(pkg_config_get("HANDLE_RC_SCRIPTS"));
- 
	if (handle_rc)
- 
		pkg_start_stop_rc_scripts(pkg, PKG_RC_START);
+ 
	if (retcode == EPKG_OK) {
+ 
		if ((flags & PKG_ADD_NOSCRIPT) == 0) {
+ 
			if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS)
+ 
				pkg_script_run(pkg, PKG_SCRIPT_POST_UPGRADE);
+ 
			else
+ 
				pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL);
+ 
		}
- 
	retcode = pkg_extract_finalize(pkg);
+ 
		/*
+ 
		 * start the different related services if the users do want that
+ 
		 * and that the service is running
+ 
		 */
- 
cleanup_reg:
- 
	pkgdb_register_finale(db, retcode);
+ 
		handle_rc = pkg_object_bool(pkg_config_get("HANDLE_RC_SCRIPTS"));
+ 
		if (handle_rc)
+ 
			pkg_start_stop_rc_scripts(pkg, PKG_RC_START);
+ 
	}



	if (retcode == EPKG_OK) {

		if ((flags & PKG_ADD_UPGRADE) == 0)