nix-community/nix-on-droid-app
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid-app.git synced 2025-11-30 14:11:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patched: Disable creation of TERMUX_APPS_DIR and TermuxAmSocketServer as paths will be changed for the stable v0.119.0 release

Browse source
This commit is contained in:
agnostic-apollo 2024-06-11 03:38:20 +05:00
parent bf33a54fe9
commit b466e9c88d
No known key found for this signature in database
GPG key ID: BCCC0287E9DCCAED
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/termux/app/TermuxApplication.java
View file

@ -52,7 +52,7 @@ public class TermuxApplication extends Application {
boolean isTermuxFilesDirectoryAccessible = error == null; boolean isTermuxFilesDirectoryAccessible = error == null;
if (isTermuxFilesDirectoryAccessible) { if (isTermuxFilesDirectoryAccessible) {
Logger.logInfo(LOG_TAG, "Termux files directory is accessible"); Logger.logInfo(LOG_TAG, "Termux files directory is accessible");
/*
error = TermuxFileUtils.isAppsTermuxAppDirectoryAccessible(true, true); error = TermuxFileUtils.isAppsTermuxAppDirectoryAccessible(true, true);
if (error != null) { if (error != null) {
Logger.logErrorExtended(LOG_TAG, "Create apps/termux-app directory failed\n" + error); Logger.logErrorExtended(LOG_TAG, "Create apps/termux-app directory failed\n" + error);
@ -61,6 +61,7 @@ public class TermuxApplication extends Application {
// Setup termux-am-socket server // Setup termux-am-socket server
TermuxAmSocketServer.setupTermuxAmSocketServer(context); TermuxAmSocketServer.setupTermuxAmSocketServer(context);
*/
} else { } else {
Logger.logErrorExtended(LOG_TAG, "Termux files directory is not accessible\n" + error); Logger.logErrorExtended(LOG_TAG, "Termux files directory is not accessible\n" + error);
} }

2
termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java
View file

@ -128,9 +128,11 @@ public class TermuxAppShellEnvironment {
if (TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT != null) if (TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT != null)
environment.put(ENV_TERMUX_APP__PACKAGE_VARIANT, TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT.getName()); environment.put(ENV_TERMUX_APP__PACKAGE_VARIANT, TermuxBootstrap.TERMUX_APP_PACKAGE_VARIANT.getName());
/*
// Will not be set for plugins // Will not be set for plugins
ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED, ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__AM_SOCKET_SERVER_ENABLED,
TermuxAmSocketServer.getTermuxAppAMSocketServerEnabled(currentPackageContext)); TermuxAmSocketServer.getTermuxAppAMSocketServerEnabled(currentPackageContext));
*/
String filesDirPath = currentPackageContext.getFilesDir().getAbsolutePath(); String filesDirPath = currentPackageContext.getFilesDir().getAbsolutePath();
ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__FILES_DIR, filesDirPath); ShellEnvironmentUtils.putToEnvIfSet(environment, ENV_TERMUX_APP__FILES_DIR, filesDirPath);