diff --git a/data/fcitx5-configtool.sh b/data/fcitx5-configtool.sh index c8b9b7a8d3a4c66a04382d2182abdc042a53e4da..817195d74bc076ed7f44f8942d6f8afaa2faed63 100755 --- a/data/fcitx5-configtool.sh +++ b/data/fcitx5-configtool.sh @@ -156,20 +156,26 @@ run_xdg() { } run_ukui() { - version=$(ukui-control-center -v 2>/dev/null | awk '{print $2}') + version=$(ukui-control-center -v 2>/dev/null) + # Qt version will print "appname version", so remove everything before the space. + # We don't know if "app name" will contain space (it is an i18n string), but we'd + # assume version doesn't contain space. + version=${version##* } + # Keep only major version. + version=${version%%.*} if [ -z "$version" ]; then return 1 fi - - version_num=$(echo "$version" | tr -d '.') - - target=5000 - - if [ "$version_num" -lt "$target" ]; then - return 1 + # Upstream command version jumped from 2.0 to 5.0, so we are targeting a version after 2.0. + target=2 + # Check if major version is a number greater than 2. + if expr "$version" : '^[0-9]\+$' > /dev/null 2>&1; then + if [ "$version" -gt "$target" ]; then + exec ukui-control-center -m keyboard inputmethod + fi fi - exec ukui-control-center -m keyboard inputmethod + return 1 } _which_cmdline() { diff --git a/debian/changelog b/debian/changelog index 698c2c6f8b01a818373697b7a364bf8eeaccb23b..47f09c276688bf10fc0a3e4bbdad858965858468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +fcitx5 (5.1.12-ok0.6) huanghe; urgency=medium + + * BUG:无 + * 需求号:无 + * 其他改动说明:重新实现在ukui桌面环境中检测输入法配置工具的机制 + * 其他改动影响域:无 + + -- hanteng Tue, 13 May 2025 10:25:30 +0800 + fcitx5 (5.1.12-ok0.5) huanghe; urgency=medium * BUG:无