这是indexloc提供的服务，不要输入任何密码
Skip to content

Add option to create sessions with the active session's working directory #1009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add option to create sessions with the active session's working directory #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9cbf33
Add config option to create sessions with the cwd.
Edontin Feb 1, 2019
fec5044
Ignore failed getCanonicalPath resolutions for cwd.
Edontin Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/src/main/java/com/termux/app/TermuxActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,15 @@ void addNewSession(boolean failSafe, String sessionName) {
}
}
String executablePath = (failSafe ? "/system/bin/sh" : null);
TerminalSession newSession = mTermService.createTermSession(executablePath, null, null, failSafe);
String workingDirectory = null;
if (mSettings.mUseCurrentSessionCwd) {
final TerminalSession currentSession = getCurrentTermSession();
if (currentSession != null) {
workingDirectory = currentSession.getCwd();
}
}

TerminalSession newSession = mTermService.createTermSession(executablePath, null, workingDirectory, failSafe);
if (sessionName != null) {
newSession.mSessionName = sessionName;
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/termux/app/TermuxPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ final static class KeyboardShortcut {
boolean mBackIsEscape;
boolean mShowExtraKeys;

boolean mUseCurrentSessionCwd;

String[][] mExtraKeys;

final List<KeyboardShortcut> shortcuts = new ArrayList<>();
Expand Down Expand Up @@ -192,6 +194,8 @@ void reloadFromProperties(Context context) {

mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));

mUseCurrentSessionCwd = "current".equals(props.getProperty("session.cwd-on-create", "default"));

shortcuts.clear();
parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
parseAction("shortcut.next-session", SHORTCUT_ACTION_NEXT_SESSION, props);
Expand Down
20 changes: 20 additions & 0 deletions terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.system.OsConstants;
import android.util.Log;

import java.io.File;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -166,6 +167,25 @@ public String getTitle() {
return (mEmulator == null) ? null : mEmulator.getTitle();
}

/** Returns the shell's working directory or null if it was unavailable. */
public String getCwd() {
if (mShellPid < 1)
return null;
try {
final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid);
String outputPath = new File(cwdSymlink)
.getCanonicalPath();
if (!outputPath.endsWith("/"))
outputPath += '/';

if (!cwdSymlink.equals(outputPath))
return outputPath;
} catch (IOException | SecurityException e) {
// Ignore.
}
return null;
}

/**
* Set the terminal emulator's window size and start terminal emulation.
*
Expand Down