Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
alpine
apk-tools
Commits
6715a0ba
Commit
6715a0ba
authored
Jul 16, 2009
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pkg: remove support for the deprecated .INSTALL script
parent
623bc9c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
22 deletions
+3
-22
src/apk_package.h
src/apk_package.h
+0
-1
src/database.c
src/database.c
+2
-7
src/package.c
src/package.c
+1
-14
No files found.
src/apk_package.h
View file @
6715a0ba
...
...
@@ -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
...
...
src/database.c
View file @
6715a0ba
...
...
@@ -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"
,
...
...
src/package.c
View file @
6715a0ba
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment