emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/package_script.c: try to find a usable shell instead of using /bin/sh

Browse Source
This commit is contained in:
Enno Boland 2019-08-13 13:56:32 +02:00 committed by Juan RP
parent 9ebe82fdc3
commit bc59d0b407
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/package_script.c
View File

@ -31,6 +31,13 @@
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
const char *shells[] = {
"/bin/sh",
"/bin/dash",
"/bin/bash",
NULL
};
int int
xbps_pkg_exec_buffer(struct xbps_handle *xhp, xbps_pkg_exec_buffer(struct xbps_handle *xhp,
const void *blob, const void *blob,
@ -39,6 +46,7 @@ xbps_pkg_exec_buffer(struct xbps_handle *xhp,
const char *action, const char *action,
bool update) bool update)
{ {
int i;
ssize_t ret; ssize_t ret;
const char *tmpdir, *version; const char *tmpdir, *version;
char *pkgname, *fpath; char *pkgname, *fpath;
@ -100,9 +108,27 @@ xbps_pkg_exec_buffer(struct xbps_handle *xhp,
version = xbps_pkg_version(pkgver); version = xbps_pkg_version(pkgver);
assert(version); assert(version);
rv = xbps_file_exec(xhp, "/bin/sh", fpath, action, pkgname, version, // find a shell that can be used to execute the script.
update ? "yes" : "no", for (i = 0; shells[i] != NULL; i++) {
"no", xhp->native_arch, NULL); if (access(shells[i], X_OK) == 0) {
break;
}
}
if (shells[i] != NULL) {
rv = xbps_file_exec(xhp, shells[i], fpath, action, pkgname, version,
update ? "yes" : "no",
"no", xhp->native_arch, NULL);
} else if (access("/bin/busybox", X_OK) == 0) {
rv = xbps_file_exec(xhp, "/bin/busybox", "sh", fpath, action, pkgname, version,
update ? "yes" : "no",
"no", xhp->native_arch, NULL);
} else if (access("/bin/busybox.static", X_OK) == 0) {
rv = xbps_file_exec(xhp, "/bin/busybox.static", "sh", fpath, action, pkgname, version,
update ? "yes" : "no",
"no", xhp->native_arch, NULL);
} else {
rv = -1;
}
free(pkgname); free(pkgname);
out: out: