From 566d656c16e9e8dae7040c7e6b5d08f142d2ce69 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 5 Jan 2020 19:09:10 +0100 Subject: [PATCH] Avoid trailing slash in CWD (fixes #1413) --- .../src/main/java/com/termux/terminal/TerminalSession.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java index 1743e844..a8c08a8d 100644 --- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java +++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java @@ -348,10 +348,11 @@ public final class TerminalSession extends TerminalOutput { try { final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid); String outputPath = new File(cwdSymlink).getCanonicalPath(); + String outputPathWithTrailingSlash = outputPath; if (!outputPath.endsWith("/")) { - outputPath += '/'; + outputPathWithTrailingSlash += '/'; } - if (!cwdSymlink.equals(outputPath)) { + if (!cwdSymlink.equals(outputPathWithTrailingSlash)) { return outputPath; } } catch (IOException | SecurityException e) {