fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

deleteFolder(): don't treat symlinks as directory

Browse Source
This commit is contained in:
Leonid Plyushch
2018-06-25 13:23:03 +03:00
committed by Fredrik Fornwall
parent 4080f41cc7
commit d3b4d35b2a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/termux/app/TermuxInstaller.java
View File

@@ -21,6 +21,7 @@ import com.termux.terminal.EmulatorDebug;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
@@ -209,11 +210,15 @@ final class TermuxInstaller {
} }
/** Delete a folder and all its content or throw. */ /** Delete a folder and all its content or throw. */
static void deleteFolder(File fileOrDirectory) { static void deleteFolder(File fileOrDirectory) throws IOException {
File[] children = fileOrDirectory.listFiles(); File[] children = fileOrDirectory.listFiles();
if (children != null) { if (children != null) {
for (File child : children) { for (File child : children) {
deleteFolder(child); if (child.getCanonicalFile().equals(child.getAbsoluteFile())) {
deleteFolder(child);
} else {
child.delete();
}
} }
} }
if (!fileOrDirectory.delete()) { if (!fileOrDirectory.delete()) {
@@ -231,7 +236,7 @@ final class TermuxInstaller {
if (storageDir.exists()) { if (storageDir.exists()) {
try { try {
deleteFolder(storageDir); deleteFolder(storageDir);
} catch (Exception e) { } catch (IOException e) {
Log.e(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage()); Log.e(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage());
return; return;
} }