From 29b03c9059a151232caf3ee7dc580ffd001d8780 Mon Sep 17 00:00:00 2001
From: Quasic <qbasic010@aim.com>
Date: Tue, 6 Feb 2018 13:53:14 -0500
Subject: [PATCH] Fix for #572: merge ~/storage instead of del

We could recursively delete, as in the method above, but that would
require a separate try block for a separate logcat message, or a
different method that returns a flag. I prefer merging in case of custom
folders. Another alternative may be to send an exit code or something for
the termux-setup-storage script to detect and echo an error message.
---
 app/src/main/java/com/termux/app/TermuxInstaller.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 1534d6bcf0..ea9599b4b8 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -228,10 +228,12 @@ public void run() {
                 try {
                     File storageDir = new File(TermuxService.HOME_PATH, "storage");
 
+                    /* commented out to merge/overwrite existing folder
                     if (storageDir.exists() && !storageDir.delete()) {
                         Log.e(LOG_TAG, "Could not delete old $HOME/storage");
                         return;
                     }
+		    */
 
                     if (!storageDir.mkdirs()) {
                         Log.e(LOG_TAG, "Unable to mkdirs() for $HOME/storage");