mirror of
https://github.com/fankes/termux-app.git
synced 2025-09-06 10:45:23 +08:00
Changed: Export correct PATH and also export LD_LIBRARY_PATH for apt-android-5
variant instead of on Android 5/6
Overrides 4e08f76f
This commit is contained in:
@@ -1,11 +1,9 @@
|
|||||||
package com.termux.shared.termux.shell;
|
package com.termux.shared.termux.shell;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Build;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import com.termux.shared.BuildConfig;
|
|
||||||
import com.termux.shared.errors.Error;
|
import com.termux.shared.errors.Error;
|
||||||
import com.termux.shared.file.filesystem.FileTypes;
|
import com.termux.shared.file.filesystem.FileTypes;
|
||||||
import com.termux.shared.termux.TermuxBootstrap;
|
import com.termux.shared.termux.TermuxBootstrap;
|
||||||
@@ -99,7 +97,7 @@ public class TermuxShellUtils {
|
|||||||
environment.add("LANG=en_US.UTF-8");
|
environment.add("LANG=en_US.UTF-8");
|
||||||
environment.add("PWD=" + workingDirectory);
|
environment.add("PWD=" + workingDirectory);
|
||||||
environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
|
environment.add("TMPDIR=" + TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH);
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
|
if (TermuxBootstrap.isAppPackageVariantAPTAndroid5()) {
|
||||||
environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
|
environment.add("PATH=" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + ":" + TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/applets");
|
||||||
environment.add("LD_LIBRARY_PATH=" + TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
|
environment.add("LD_LIBRARY_PATH=" + TermuxConstants.TERMUX_LIB_PREFIX_DIR_PATH);
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user