Skip to content

Commit abcf738

Browse files
halt on installing 1password if signature verification fails, link -f snap neovim to usr/local/bin/nvim
1 parent f9d5521 commit abcf738

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

install/desktop/optional/app-1password.sh

+10-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@ case "$ARCH" in
99
curl -sSO https://downloads.1password.com/linux/tar/stable/aarch64/1password-latest.tar.gz.sig
1010
gpg --keyserver keyserver.ubuntu.com --recv-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
1111
gpg --verify 1password-latest.tar.gz.sig 1password-latest.tar.gz
12-
[ $? -eq 0 ] || { cd - && false; }
13-
sudo tar -xf 1password-latest.tar.gz
14-
sudo mkdir -p /opt/1Password
15-
sudo mv 1password-*/* /opt/1Password
16-
sudo /opt/1Password/after-install.sh
17-
cd -
12+
if [[ $? -eq 0 ]]; then
13+
sudo tar -xf 1password-latest.tar.gz
14+
sudo mkdir -p /opt/1Password
15+
sudo mv 1password-*/* /opt/1Password
16+
sudo /opt/1Password/after-install.sh
17+
cd -
18+
else
19+
cd -
20+
false
21+
fi
1822
;;
1923
*)
2024
# Install 1password and 1password-cli single script

install/terminal/app-neovim.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ if [[ "${ARCH}" == "aarch64" ]]; then
99
sudo apt update
1010
sudo apt install -y snapd
1111
fi
12-
sudo snap install --classic nvim && NEOVIM_SUCCESS=true
12+
sudo snap install --classic nvim \
13+
&& sudo ln -sf /snap/bin/nvim /usr/local/bin/nvim \
14+
&& NEOVIM_SUCCESS=true
1315
else
1416
if wget -O nvim.tar.gz "https://github.com/neovim/neovim/releases/latest/download/nvim-linu${ARCH}.tar.gz"; then
1517
tar -xf nvim.tar.gz

0 commit comments

Comments
 (0)