fix fcitx5 variables according to arch wiki

4 files changed, 15 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84371a224f93..348d359d0797 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = manjaro-asian-input-support
 	pkgdesc = Asian input support from Manjaro
-	pkgver = 2020.07
-	pkgrel = 4
+	pkgver = 2020.08
+	pkgrel = 1
 	url = https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support
 	install = input-support.install
 	arch = any
@@ -11,11 +11,13 @@ pkgbase = manjaro-asian-input-support
 	conflicts = manjaro-asian-input-support-fcitx5
 	source = enable-fcitx.sh
 	source = enable-ibus.sh
+	source = enable-fcitx5.sh
 	source = fcitx5.desktop
 	source = fcitx5.profile
 	source = ibus.desktop
 	md5sums = 42db8df96db00e8fcc023b7bc9135b21
 	md5sums = 1a68e770b9f426301b6a08fe8edb47f1
+	md5sums = 76683bfe0294238b08cd7c67b0806fd9
 	md5sums = 97a5be2b8ff8c0fc895d9ef21531e698
 	md5sums = 3578677a7102c9f8be3b9f7ea7d3d06f
 	md5sums = f1a9f3406f8268383149889f4816cd52
diff --git a/PKGBUILD b/PKGBUILD
index 04119ebe0869..6459fe13a11f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=manjaro-asian-input-support
 pkgname=('ibus-input-support' 'fcitx-input-support' 'fcitx5-input-support')
-pkgver=2020.07
-pkgrel=4
+pkgver=2020.08
+pkgrel=1
 arch=('any')
 url="https://gitlab.manjaro.org/packages/community/manjaro-asian-input-support"
 license=('GPL')
@@ -13,12 +13,14 @@ pkgdesc='Asian input support from Manjaro'
 source=(
 	'enable-fcitx.sh'
 	'enable-ibus.sh'
+	'enable-fcitx5.sh'
 	'fcitx5.desktop'
 	'fcitx5.profile'
 	'ibus.desktop'
 )
 md5sums=('42db8df96db00e8fcc023b7bc9135b21'
          '1a68e770b9f426301b6a08fe8edb47f1'
+         '76683bfe0294238b08cd7c67b0806fd9'
          '97a5be2b8ff8c0fc895d9ef21531e698'
          '3578677a7102c9f8be3b9f7ea7d3d06f'
          'f1a9f3406f8268383149889f4816cd52')
@@ -79,7 +81,7 @@ package_fcitx5-input-support() {
 		'fcitx5-unikey: Tiếng Việt | Vietnamese'
 	)
 	provides=("${pkgbase}-fcitx5")
-	install -Dm644 "$srcdir/enable-fcitx.sh" "$pkgdir/etc/profile.d/input-support.sh"
+	install -Dm644 "$srcdir/enable-fcitx5.sh" "$pkgdir/etc/profile.d/input-support.sh"
 	install -Dm644 "$srcdir/fcitx5.desktop" "$pkgdir/etc/xdg/autostart/fcitx5.desktop"
 	install -Dm644 "$srcdir/fcitx5.profile" "$pkgdir/etc/xdg/fcitx5/profile"
 }
diff --git a/enable-fcitx5.sh b/enable-fcitx5.sh
new file mode 100644
index 000000000000..a18dc8aa52c4
--- /dev/null
+++ b/enable-fcitx5.sh
@@ -0,0 +1,5 @@
+# https://wiki.archlinux.org/index.php/Fcitx5
+export INPUT_METHOD=fcitx5
+export GTK_IM_MODULE=fcitx5
+export QT_IM_MODULE=fcitx5
+export XMODIFIERS=@im=fcitx5
diff --git a/input-support.install b/input-support.install
index a6c259229a79..2c478687ca85 100644
--- a/input-support.install
+++ b/input-support.install
@@ -1,7 +1,7 @@
 post_install() {
 	echo
 	echo "To make the environmental variables set automatically, \
-it's recommended not to use fish as your login shell."
+it's not recommended to use fish as your login shell."
 	echo 'Re-login or reboot to apply modify.'
 	echo
 }