mirror of
https://github.com/termux/termux-packages
synced 2024-06-20 18:17:08 +00:00
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
--- a/zellij-server/src/pty.rs
|
|
+++ b/zellij-server/src/pty.rs
|
|
@@ -445,8 +445,8 @@ impl Pty {
|
|
}
|
|
pub fn get_default_terminal(&self, cwd: Option<PathBuf>) -> TerminalAction {
|
|
let shell = PathBuf::from(env::var("SHELL").unwrap_or_else(|_| {
|
|
- log::warn!("Cannot read SHELL env, falling back to use /bin/sh");
|
|
- "/bin/sh".to_string()
|
|
+ log::warn!("Cannot read SHELL env, falling back to use @TERMUX_PREFIX@/bin/sh");
|
|
+ "@TERMUX_PREFIX@/bin/sh".to_string()
|
|
}));
|
|
if !shell.exists() {
|
|
panic!("Cannot find shell {}", shell.display());
|
|
--- a/zellij-utils/src/consts.rs
|
|
+++ b/zellij-utils/src/consts.rs
|
|
@@ -13,7 +13,7 @@ pub const DEFAULT_SCROLL_BUFFER_SIZE: usize = 10_000;
|
|
pub static SCROLL_BUFFER_SIZE: OnceCell<usize> = OnceCell::new();
|
|
pub static DEBUG_MODE: OnceCell<bool> = OnceCell::new();
|
|
|
|
-pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "/etc/zellij";
|
|
+pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "@TERMUX_PREFIX@/etc/zellij";
|
|
pub const SYSTEM_DEFAULT_DATA_DIR_PREFIX: &str = system_default_data_dir();
|
|
|
|
const fn system_default_data_dir() -> &'static str {
|