summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2009-07-16 08:52:22 +0300
committerTimo Teras <timo.teras@iki.fi>2009-07-16 08:52:22 +0300
commit6715a0ba12af54767ba889de07afe3543b7c1543 (patch)
tree40374647df20dc2ca7a4721391598997b644767e
parent623bc9c5a820906e26c0cc52d0ab230c3c0bc1ab (diff)
downloadapk-tools-6715a0ba12af54767ba889de07afe3543b7c1543.tar.bz2
apk-tools-6715a0ba12af54767ba889de07afe3543b7c1543.tar.xz
pkg: remove support for the deprecated .INSTALL script
-rw-r--r--src/apk_package.h1
-rw-r--r--src/database.c9
-rw-r--r--src/package.c15
3 files changed, 3 insertions, 22 deletions
diff --git a/src/apk_package.h b/src/apk_package.h
index a281712..b874e0c 100644
--- a/src/apk_package.h
+++ b/src/apk_package.h
@@ -20,7 +20,6 @@ struct apk_database;
struct apk_name;
#define APK_SCRIPT_INVALID -1
-#define APK_SCRIPT_GENERIC 0
#define APK_SCRIPT_PRE_INSTALL 1
#define APK_SCRIPT_POST_INSTALL 2
#define APK_SCRIPT_PRE_DEINSTALL 3
diff --git a/src/database.c b/src/database.c
index 80b6fc3..4daa66a 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1179,11 +1179,7 @@ static int apk_db_install_archive_entry(void *_ctx,
/* Package metainfo and script processing */
if (ae->name[0] == '.') {
/* APK 2.0 format */
- if (strcmp(ae->name, ".INSTALL") == 0)
- type = APK_SCRIPT_GENERIC;
- else
- type = apk_script_type(&ae->name[1]);
-
+ type = apk_script_type(&ae->name[1]);
if (type == APK_SCRIPT_INVALID)
return 0;
} else if (strncmp(ae->name, "var/db/apk/", 11) == 0) {
@@ -1205,8 +1201,7 @@ static int apk_db_install_archive_entry(void *_ctx,
if (type != APK_SCRIPT_INVALID) {
apk_pkg_add_script(pkg, is, type, ae->size);
- if (type == APK_SCRIPT_GENERIC ||
- type == ctx->script) {
+ if (type == ctx->script) {
r = apk_pkg_run_script(pkg, db->root_fd, ctx->script);
if (r != 0)
apk_error("%s-%s: Failed to execute pre-install/upgrade script",
diff --git a/src/package.c b/src/package.c
index d408f73..86595c9 100644
--- a/src/package.c
+++ b/src/package.c
@@ -242,15 +242,6 @@ const char *apk_script_types[] = {
[APK_SCRIPT_POST_UPGRADE] = "post-upgrade",
};
-static const char *script_types2[] = {
- [APK_SCRIPT_PRE_INSTALL] = "pre_install",
- [APK_SCRIPT_POST_INSTALL] = "post_install",
- [APK_SCRIPT_PRE_DEINSTALL] = "pre_deinstall",
- [APK_SCRIPT_POST_DEINSTALL] = "post_deinstall",
- [APK_SCRIPT_PRE_UPGRADE] = "pre_upgrade",
- [APK_SCRIPT_POST_UPGRADE] = "post_upgrade",
-};
-
int apk_script_type(const char *name)
{
int i;
@@ -569,8 +560,7 @@ int apk_pkg_run_script(struct apk_package *pkg, int root_fd,
fchdir(root_fd);
hlist_for_each_entry(script, c, &pkg->scripts, script_list) {
- if (script->type != type &&
- script->type != APK_SCRIPT_GENERIC)
+ if (script->type != type)
continue;
snprintf(fn, sizeof(fn),
@@ -591,9 +581,6 @@ int apk_pkg_run_script(struct apk_package *pkg, int root_fd,
if (pid == 0) {
if (chroot(".") < 0) {
apk_error("chroot: %s", strerror(errno));
- } else if (script->type == APK_SCRIPT_GENERIC) {
- execle(fn, "INSTALL", script_types2[type],
- pkg->version, "", NULL, environment);
} else {
execle(fn, apk_script_types[type],
pkg->version, "", NULL, environment);