Fix termux-reset

The TMPDIR was being automatically cleared and recreated even if it didn't already exist when TermuxService was stopped. This left an empty TMPDIR in the PREFIX directory when termux-reset was run and on termux restart the bootstrap wasn't installed again because PREFIX directory already existed. This resulted in a broken environment since no binaries/libs existed under PREFIX and /system/bin/sh was loaded. This issue was created due to v0.109.
termux · Apr 20, 2021 · d6eb5e3 · d6eb5e3
1 parent a6ae656
commit d6eb5e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
@@ -157,7 +157,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
  public void onDestroy() {
  Logger.logVerbose(LOG_TAG, "onDestroy");
 
- ShellUtils.clearTermuxTMPDIR(this);
+ ShellUtils.clearTermuxTMPDIR(this, true);
 
  actionReleaseWakeLock(false);
  if (!mWantsToStop)

diff --git a/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java
@@ -150,7 +150,10 @@ public static String getExecutableBasename(String executable) {
  return (lastSlash == -1) ? executable : executable.substring(lastSlash + 1);
  }
 
- public static void clearTermuxTMPDIR(Context context) {
+ public static void clearTermuxTMPDIR(Context context, boolean onlyIfExists) {
+ if(onlyIfExists && !FileUtils.directoryFileExists(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, false))
+ return;
+
  String errmsg;
  errmsg = FileUtils.clearDirectory(context, "$TMPDIR", FileUtils.getCanonicalPath(TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH, null, false));
  if (errmsg != null) {