Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5db007b
Run lua scripts before shell scripts
Baptiste Daroussin committed 5 years ago
commit 5db007bf743fc4342e7232f9496089179c5a2e1f
parent 2bd2332
3 files changed +16 -16
modified libpkg/pkg_add.c
@@ -964,11 +964,11 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag
	 * Execute pre deinstall scripts

	 */

	if ((flags & PKG_ADD_NOSCRIPT) == 0) {
- 
		ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL, (old != NULL));
+ 
		ret = pkg_lua_script_run(old, PKG_SCRIPT_PRE_DEINSTALL, (old != NULL));

		if (ret != EPKG_OK && ctx.developer_mode) {

			return (ret);

		} else {
- 
			ret = pkg_lua_script_run(old, PKG_LUA_PRE_DEINSTALL, (old != NULL));
+ 
			ret = pkg_script_run(old, PKG_LUA_PRE_DEINSTALL, (old != NULL));

			if (ret != EPKG_OK && ctx.developer_mode) {

				return (ret);

			} else {
@@ -1124,9 +1124,9 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
	 * Execute pre-install scripts

	 */

	if ((flags & PKG_ADD_NOSCRIPT) == 0) {
- 
		if ((retcode = pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL, (local != NULL))) != EPKG_OK)
+ 
		if ((retcode = pkg_lua_script_run(pkg, PKG_SCRIPT_PRE_INSTALL, (local != NULL))) != EPKG_OK)

			goto cleanup;
- 
		if ((retcode = pkg_lua_script_run(pkg, PKG_LUA_PRE_INSTALL, (local != NULL))) != EPKG_OK)
+ 
		if ((retcode = pkg_script_run(pkg, PKG_LUA_PRE_INSTALL, (local != NULL))) != EPKG_OK)

			goto cleanup;

	}
@@ -1172,8 +1172,8 @@ cleanup_reg:
	if (retcode != EPKG_OK)

		goto cleanup;

	if ((flags & PKG_ADD_NOSCRIPT) == 0) {
- 
		pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL, (local != NULL));
- 
		pkg_lua_script_run(pkg, PKG_LUA_POST_INSTALL, (local != NULL));
+ 
		pkg_lua_script_run(pkg, PKG_SCRIPT_POST_INSTALL, (local != NULL));
+ 
		pkg_script_run(pkg, PKG_LUA_POST_INSTALL, (local != NULL));

	}



	/*
modified libpkg/pkg_delete.c
@@ -92,13 +92,13 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
	if ((flags & PKG_DELETE_NOSCRIPT) == 0) {

		pkg_open_root_fd(pkg);

		if (!(flags & PKG_DELETE_UPGRADE)) {
- 
			ret = pkg_script_run(pkg, PKG_SCRIPT_PRE_DEINSTALL, false);
+ 
			ret = pkg_lua_script_run(pkg, PKG_SCRIPT_PRE_DEINSTALL, false);
+ 
			if (ret != EPKG_OK && ctx.developer_mode)
+ 
				return (ret);
+ 
			ret = pkg_script_run(pkg, PKG_LUA_PRE_DEINSTALL, false);

			if (ret != EPKG_OK && ctx.developer_mode)

				return (ret);

		}
- 
		ret = pkg_lua_script_run(pkg, PKG_LUA_PRE_DEINSTALL, false);
- 
		if (ret != EPKG_OK && ctx.developer_mode)
- 
			return (ret);

	}



	if ((ret = pkg_delete_files(pkg, flags & PKG_DELETE_FORCE ? 1 : 0))
@@ -106,8 +106,8 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
		return (ret);



	if ((flags & (PKG_DELETE_NOSCRIPT | PKG_DELETE_UPGRADE)) == 0) {
- 
		pkg_script_run(pkg, PKG_SCRIPT_POST_DEINSTALL, false);
- 
		pkg_lua_script_run(pkg, PKG_LUA_POST_DEINSTALL, false);
+ 
		pkg_lua_script_run(pkg, PKG_SCRIPT_POST_DEINSTALL, false);
+ 
		pkg_script_run(pkg, PKG_LUA_POST_DEINSTALL, false);

	}



	ret = pkg_delete_dirs(db, pkg, NULL);
modified libpkg/pkg_ports.c
@@ -1317,8 +1317,8 @@ pkg_add_port(struct pkgdb *db, struct pkg *pkg, const char *input_path,


	if (!testing) {

		/* Execute pre-install scripts */
- 
		pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL, false);
- 
		pkg_lua_script_run(pkg, PKG_LUA_PRE_INSTALL, false);
+ 
		pkg_lua_script_run(pkg, PKG_SCRIPT_PRE_INSTALL, false);
+ 
		pkg_script_run(pkg, PKG_LUA_PRE_INSTALL, false);



		if (input_path != NULL) {

			pkg_register_cleanup_callback(pkg_rollback_cb, pkg);
@@ -1331,8 +1331,8 @@ pkg_add_port(struct pkgdb *db, struct pkg *pkg, const char *input_path,
		}



		/* Execute post-install scripts */
- 
		pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL, false);
- 
		pkg_lua_script_run(pkg, PKG_LUA_POST_INSTALL, false);
+ 
		pkg_lua_script_run(pkg, PKG_SCRIPT_POST_INSTALL, false);
+ 
		pkg_script_run(pkg, PKG_LUA_POST_INSTALL, false);

	}



	if (rc == EPKG_OK) {