Fix APE uname direction

Fixes #942
This commit is contained in:
Justine Tunney 2023-11-10 12:23:09 -08:00
parent d2f49ca175
commit 3d3cdcf276
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
2 changed files with 6 additions and 4 deletions

View file

@ -592,8 +592,9 @@ ape_disk:
#ifdef APE_IS_SHELL_SCRIPT
apesh: .ascii "\n@\n#'\"\n" // sixth edition shebang
.ascii "m=\"$(/bin/uname -m >/dev/null)\" || "
.ascii "m=\"$(/usr/bin/uname -m)\"\n"
.ascii "m=$(/bin/uname -m 2>/dev/null) || "
.ascii "m=$(/usr/bin/uname -m 2>/dev/null) || "
.ascii "m=x86_64\n"
.ascii "if [ \"$m\" = x86_64 ] || [ \"$m\" = amd64 ]; then\n"
// Until all operating systems can be updated to support APE,

View file

@ -1944,8 +1944,9 @@ int main(int argc, char *argv[]) {
}
// otherwise this is a fresh install so consider the platform
p = stpcpy(p, "m=\"$(/bin/uname -m >/dev/null)\" || "
"m=\"$(/usr/bin/uname -m)\"\n");
p = stpcpy(p, "m=$(/bin/uname -m 2>/dev/null) || "
"m=$(/usr/bin/uname -m 2>/dev/null) || "
"m=x86_64\n");
if (support_vector & _HOSTXNU) {
p = stpcpy(p, "if [ ! -d /Applications ]; then\n");
}