From 5ce45908b190b8f55e079775d881e432fe0d77a5 Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Fri, 3 May 2024 11:19:11 +0200 Subject: [PATCH] install.sh: use per-channel binary names in `~/.local/bin` (#11339) Release Notes: - N/A --- script/install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/install.sh b/script/install.sh index 84c8ce7a22e69119a2cf74309f825207975b3434..eda83d3c5ba5f518e59bcf9544022b8c6509dcb4 100755 --- a/script/install.sh +++ b/script/install.sh @@ -80,7 +80,8 @@ linux() { mkdir -p "$HOME/.local/bin" "$HOME/.local/share/applications" # Link the binary - ln -sf ~/.local/zed$suffix.app/bin/zed ~/.local/bin/ + binary_name="zed${suffix}" + ln -sf ~/.local/zed$suffix.app/bin/zed "$HOME/.local/bin/${binary_name}" # Copy .desktop file desktop_file_path="$HOME/.local/share/applications/${appid}.desktop" @@ -88,14 +89,14 @@ linux() { sed -i "s|Icon=zed|Icon=$HOME/.local/zed$suffix.app/share/icons/hicolor/512x512/apps/zed.png|g" "${desktop_file_path}" sed -i "s|Exec=zed|Exec=$HOME/.local/zed$suffix.app/bin/zed|g" "${desktop_file_path}" - if which zed >/dev/null 2>&1; then - echo "Zed has been installed. Run with 'zed'" + if which "${binary_name}" >/dev/null 2>&1; then + echo "Zed has been installed. Run with '${binary_name}'" else - echo "To run zed from your terminal, you must add ~/.local/bin to your PATH" + echo "To run Zed from your terminal, you must add ~/.local/bin to your PATH" echo "Run:" echo " echo 'export PATH=\$HOME/.local/bin:\$PATH' >> ~/.bashrc" echo " source ~/.bashrc" - echo "To run zed now, '~/.local/bin/zed'" + echo "To run Zed now, '~/.local/bin/${binary_name}'" fi }