Skip to content

Commit acefcc1

Browse files
nhktmdzhgnhktmdzhg
committed
fix: add install method for fish shell for ubuntu, debian, fedora
1 parent 8408eec commit acefcc1

3 files changed

Lines changed: 22 additions & 13 deletions

File tree

‎src/components/InteractiveInstaller.vue‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,12 @@ const installStepCode = computed(() => {
135135
selectedDistro.value as keyof typeof logic.steps.install
136136
];
137137
if (!distroInfo) return 'Cấu hình chưa sẵn sàng.';
138-
return (
139-
(distroInfo as any)[selectedMethod.value] || 'Phương thức chưa sẵn sàng.'
140-
);
138+
const methodData = (distroInfo as any)[selectedMethod.value];
139+
if (!methodData) return 'Phương thức chưa sẵn sàng.';
140+
if (typeof methodData === 'object' && methodData !== null) {
141+
return methodData[selectedShell.value] || methodData.Bash || 'Cấu hình chưa sẵn sàng.';
142+
}
143+
return methodData;
141144
});
142145
143146
const autostartText = computed(

‎src/data/installer.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,33 @@ export const logic = {
3232
steps: {
3333
install: {
3434
'Arch Linux': {
35-
'Package Manager': 'yay -S fcitx5-lotus-bin',
35+
'Package Manager': 'paru -S fcitx5-lotus-bin',
3636
Binary: 'Arch khuyến khích sử dụng AUR để cài đặt',
37-
Source: 'yay -S fcitx5-lotus-git',
37+
Source: 'paru -S fcitx5-lotus-git',
3838
},
3939
Debian: {
40-
'Package Manager':
41-
"CODENAME=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2)\nsudo mkdir -p /etc/apt/keyrings\ncurl -fsSL https://fcitx5-lotus.pages.dev/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/fcitx5-lotus.gpg\necho \"deb [signed-by=/etc/apt/keyrings/fcitx5-lotus.gpg] https://fcitx5-lotus.pages.dev/apt/$CODENAME $CODENAME main\" | sudo tee /etc/apt/sources.list.d/fcitx5-lotus.list\nsudo apt update && sudo apt install fcitx5-lotus",
40+
'Package Manager': {
41+
Bash: "CODENAME=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2)\nsudo mkdir -p /etc/apt/keyrings\ncurl -fsSL https://fcitx5-lotus.pages.dev/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/fcitx5-lotus.gpg\necho \"deb [signed-by=/etc/apt/keyrings/fcitx5-lotus.gpg] https://fcitx5-lotus.pages.dev/apt/$CODENAME $CODENAME main\" | sudo tee /etc/apt/sources.list.d/fcitx5-lotus.list\nsudo apt update && sudo apt install fcitx5-lotus",
42+
Fish: "set CODENAME (grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2)\nsudo mkdir -p /etc/apt/keyrings\ncurl -fsSL https://fcitx5-lotus.pages.dev/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/fcitx5-lotus.gpg\necho \"deb [signed-by=/etc/apt/keyrings/fcitx5-lotus.gpg] https://fcitx5-lotus.pages.dev/apt/$CODENAME $CODENAME main\" | sudo tee /etc/apt/sources.list.d/fcitx5-lotus.list\nsudo apt update && sudo apt install fcitx5-lotus",
43+
},
4244
Binary: 'sudo dpkg -i fcitx5-lotus_*.deb',
4345
Source:
4446
'sudo apt-get install acl cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config libx11-dev fcitx5-modules-dev python3\ngit clone https://github.com/LotusInputMethod/fcitx5-lotus.git\ncd fcitx5-lotus\ncmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib .\nmake\nsudo make install',
4547
},
4648
Ubuntu: {
47-
'Package Manager':
48-
"CODENAME=$(grep '^UBUNTU_CODENAME=' /etc/os-release | cut -d'=' -f2)\nsudo mkdir -p /etc/apt/keyrings\ncurl -fsSL https://fcitx5-lotus.pages.dev/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/fcitx5-lotus.gpg\necho \"deb [signed-by=/etc/apt/keyrings/fcitx5-lotus.gpg] https://fcitx5-lotus.pages.dev/apt/$CODENAME $CODENAME main\" | sudo tee /etc/apt/sources.list.d/fcitx5-lotus.list\nsudo apt update && sudo apt install fcitx5-lotus",
49+
'Package Manager': {
50+
Bash: "CODENAME=$(grep '^UBUNTU_CODENAME=' /etc/os-release | cut -d'=' -f2)\nsudo mkdir -p /etc/apt/keyrings\ncurl -fsSL https://fcitx5-lotus.pages.dev/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/fcitx5-lotus.gpg\necho \"deb [signed-by=/etc/apt/keyrings/fcitx5-lotus.gpg] https://fcitx5-lotus.pages.dev/apt/$CODENAME $CODENAME main\" | sudo tee /etc/apt/sources.list.d/fcitx5-lotus.list\nsudo apt update && sudo apt install fcitx5-lotus",
51+
Fish: "set CODENAME (grep '^UBUNTU_CODENAME=' /etc/os-release | cut -d'=' -f2)\nsudo mkdir -p /etc/apt/keyrings\ncurl -fsSL https://fcitx5-lotus.pages.dev/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/fcitx5-lotus.gpg\necho \"deb [signed-by=/etc/apt/keyrings/fcitx5-lotus.gpg] https://fcitx5-lotus.pages.dev/apt/$CODENAME $CODENAME main\" | sudo tee /etc/apt/sources.list.d/fcitx5-lotus.list\nsudo apt update && sudo apt install fcitx5-lotus",
52+
},
4953
Binary: 'sudo dpkg -i fcitx5-lotus_*.deb',
5054
Source:
5155
'sudo apt-get install acl cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config libx11-dev fcitx5-modules-dev python3\ngit clone https://github.com/LotusInputMethod/fcitx5-lotus.git\ncd fcitx5-lotus\ncmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib .\nmake\nsudo make install',
5256
},
5357
Fedora: {
54-
'Package Manager':
55-
"RELEASEVER=$(grep '^VERSION_ID=' /etc/os-release | cut -d'=' -f2)\nsudo rpm --import https://fcitx5-lotus.pages.dev/pubkey.gpg\nsudo dnf config-manager addrepo --from-repofile=https://fcitx5-lotus.pages.dev/rpm/fedora/fcitx5-lotus-$RELEASEVER.repo\nsudo dnf install fcitx5-lotus",
58+
'Package Manager': {
59+
Bash: "RELEASEVER=$(grep '^VERSION_ID=' /etc/os-release | cut -d'=' -f2)\nsudo rpm --import https://fcitx5-lotus.pages.dev/pubkey.gpg\nsudo dnf config-manager addrepo --from-repofile=https://fcitx5-lotus.pages.dev/rpm/fedora/fcitx5-lotus-$RELEASEVER.repo\nsudo dnf install fcitx5-lotus",
60+
Fish: "set RELEASEVER (grep '^VERSION_ID=' /etc/os-release | cut -d'=' -f2)\nsudo rpm --import https://fcitx5-lotus.pages.dev/pubkey.gpg\nsudo dnf config-manager addrepo --from-repofile=https://fcitx5-lotus.pages.dev/rpm/fedora/fcitx5-lotus-$RELEASEVER.repo\nsudo dnf install fcitx5-lotus",
61+
},
5662
Binary: 'sudo rpm -i fcitx5-lotus-*.rpm',
5763
Source:
5864
'sudo dnf install acl cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel libX11-devel python3\ngit clone https://github.com/LotusInputMethod/fcitx5-lotus.git\ncd fcitx5-lotus\ncmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib .\nmake\nsudo make install',

‎src/views/Home.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,13 +893,13 @@ const copyToClipboard = async (text: string | undefined): Promise<void> => {
893893
/>
894894
</div>
895895
<div class="code-container">
896-
<pre><code>yay -Rns fcitx5-lotus</code></pre>
896+
<pre><code>paru -Rns fcitx5-lotus</code></pre>
897897
<el-button
898898
class="copy-float"
899899
circle
900900
size="small"
901901
:icon="DocumentCopy"
902-
@click="copyToClipboard('yay -Rns fcitx5-lotus')"
902+
@click="copyToClipboard('paru -Rns fcitx5-lotus')"
903903
/>
904904
</div>
905905
<div class="code-container">

0 commit comments

Comments
 (0)