From c96e9fe509d678f209a3fd7e6191ecc9912629f1 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 13 Mar 2022 15:02:38 +0900 Subject: [PATCH] mcfly: Disable broken Bash support See https://github.com/termux/termux-packages/issues/8722. --- packages/mcfly/build.sh | 3 ++- packages/mcfly/src-settings.rs.patch | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 packages/mcfly/src-settings.rs.patch diff --git a/packages/mcfly/build.sh b/packages/mcfly/build.sh index 045319173..179f4a47f 100644 --- a/packages/mcfly/build.sh +++ b/packages/mcfly/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Replaces your default ctrl-r shell history search with a TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.5.12 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/cantino/mcfly/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=41bbcbde13c3a27696cb4ac0b9e752a925661747acc4075450e10d4e17b17bde TERMUX_PKG_BUILD_IN_SRC=true @@ -25,5 +26,5 @@ termux_step_make() { termux_step_make_install() { install -Dm700 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/mcfly - install -Dm600 -t $TERMUX_PREFIX/share/mcfly mcfly.{ba,fi,z}sh + install -Dm600 -t $TERMUX_PREFIX/share/mcfly mcfly.{fi,z}sh } diff --git a/packages/mcfly/src-settings.rs.patch b/packages/mcfly/src-settings.rs.patch new file mode 100644 index 000000000..89cdaf478 --- /dev/null +++ b/packages/mcfly/src-settings.rs.patch @@ -0,0 +1,23 @@ +--- a/src/settings.rs ++++ b/src/settings.rs +@@ -238,8 +238,8 @@ + .subcommand(SubCommand::with_name("init") + .about("Prints the shell code used to execute mcfly") + .arg(Arg::with_name("shell") +- .help("Shell to init — one of bash, zsh, or fish") +- .possible_values(&["bash", "zsh", "fish"]) ++ .help("Shell to init — one of zsh or fish") ++ .possible_values(&["zsh", "fish"]) + .required(true)) + ) + .get_matches(); +@@ -459,9 +459,6 @@ + ("init", Some(init_matches)) => { + settings.mode = Mode::Init; + match init_matches.value_of("shell").unwrap() { +- "bash" => { +- settings.init_mode = InitMode::Bash; +- } + "zsh" => { + settings.init_mode = InitMode::Zsh; + }