mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-28 21:03:51 +03:00
5f29f214c3
Closes #20070 Release Notes: - Fixed issue where files wouldn't open from the file explorer. - Fixed "Open a new workspace" option on the desktop entry right-click menu. Context: Zed consists of two binaries: - `zed` (CLI component, located at `crates/cli/main.rs`) - `zed-editor` (GUI component, located at `crates/zed/main.rs`) When `zed` is used in the terminal, it checks if an existing instance is running. If one is found, it sends data via a socket to open the specified file. Otherwise, it launches a new instance of `zed-editor`. For more details, see the `detect` and `boot_background` functions in `crates/cli/main.rs`. Root Cause: Install process creates directories like `.local/zed.app` and `.local/zed-preview.app`, which contain desktop entries for the corresponding release. For example, `.local/zed.app/share/applications` contains `zed.desktop`. This desktop entry includes a generic `Exec` field, which is correct by default: ```sh Comment=A high-performance, multiplayer code editor. TryExec=zed StartupNotify=true ``` The issue is in the `install.sh` script. This script copies the above desktop file to the common directory for desktop entries (.local/share/applications). During this process, it replaces the `TryExec` value from `zed` with the exact binary path to avoid relying on the shell's PATH resolution and to make it explicit. However, replacement incorrectly uses the path for `zed-editor` instead of the `zed` CLI binary. This results in not opening a file as if you use `zed-editor` directly to do this it will throw `zed is already running` error on production and open new instance on dev. Note: This PR solves it for new users. For existing users, they will either have to update `.desktop` file manually, or use `install.sh` script again. I'm not aware of zed auto-update method, if it runs `install.sh` under the hood.
150 lines
4.2 KiB
Bash
Executable File
150 lines
4.2 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
set -eu
|
|
|
|
# Downloads the latest tarball from https://zed.dev/releases and unpacks it
|
|
# into ~/.local/. If you'd prefer to do this manually, instructions are at
|
|
# https://zed.dev/docs/linux.
|
|
|
|
main() {
|
|
platform="$(uname -s)"
|
|
arch="$(uname -m)"
|
|
channel="${ZED_CHANNEL:-stable}"
|
|
temp="$(mktemp -d "/tmp/zed-XXXXXX")"
|
|
|
|
if [ "$platform" = "Darwin" ]; then
|
|
platform="macos"
|
|
elif [ "$platform" = "Linux" ]; then
|
|
platform="linux"
|
|
else
|
|
echo "Unsupported platform $platform"
|
|
exit 1
|
|
fi
|
|
|
|
case "$platform-$arch" in
|
|
macos-arm64* | linux-arm64* | linux-armhf | linux-aarch64)
|
|
arch="aarch64"
|
|
;;
|
|
macos-x86* | linux-x86* | linux-i686*)
|
|
arch="x86_64"
|
|
;;
|
|
*)
|
|
echo "Unsupported platform or architecture"
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
if command -v curl >/dev/null 2>&1; then
|
|
curl () {
|
|
command curl -fL "$@"
|
|
}
|
|
elif command -v wget >/dev/null 2>&1; then
|
|
curl () {
|
|
wget -O- "$@"
|
|
}
|
|
else
|
|
echo "Could not find 'curl' or 'wget' in your path"
|
|
exit 1
|
|
fi
|
|
|
|
"$platform" "$@"
|
|
|
|
if [ "$(command -v zed)" = "$HOME/.local/bin/zed" ]; then
|
|
echo "Zed has been installed. Run with 'zed'"
|
|
else
|
|
echo "To run Zed from your terminal, you must add ~/.local/bin to your PATH"
|
|
echo "Run:"
|
|
|
|
case "$SHELL" in
|
|
*zsh)
|
|
echo " echo 'export PATH=\$HOME/.local/bin:\$PATH' >> ~/.zshrc"
|
|
echo " source ~/.zshrc"
|
|
;;
|
|
*fish)
|
|
echo " fish_add_path -U $HOME/.local/bin"
|
|
;;
|
|
*)
|
|
echo " echo 'export PATH=\$HOME/.local/bin:\$PATH' >> ~/.bashrc"
|
|
echo " source ~/.bashrc"
|
|
;;
|
|
esac
|
|
|
|
echo "To run Zed now, '~/.local/bin/zed'"
|
|
fi
|
|
}
|
|
|
|
linux() {
|
|
if [ -n "${ZED_BUNDLE_PATH:-}" ]; then
|
|
cp "$ZED_BUNDLE_PATH" "$temp/zed-linux-$arch.tar.gz"
|
|
else
|
|
echo "Downloading Zed"
|
|
curl "https://zed.dev/api/releases/$channel/latest/zed-linux-$arch.tar.gz" > "$temp/zed-linux-$arch.tar.gz"
|
|
fi
|
|
|
|
suffix=""
|
|
if [ "$channel" != "stable" ]; then
|
|
suffix="-$channel"
|
|
fi
|
|
|
|
appid=""
|
|
case "$channel" in
|
|
stable)
|
|
appid="dev.zed.Zed"
|
|
;;
|
|
nightly)
|
|
appid="dev.zed.Zed-Nightly"
|
|
;;
|
|
preview)
|
|
appid="dev.zed.Zed-Preview"
|
|
;;
|
|
dev)
|
|
appid="dev.zed.Zed-Dev"
|
|
;;
|
|
*)
|
|
echo "Unknown release channel: ${channel}. Using stable app ID."
|
|
appid="dev.zed.Zed"
|
|
;;
|
|
esac
|
|
|
|
# Unpack
|
|
rm -rf "$HOME/.local/zed$suffix.app"
|
|
mkdir -p "$HOME/.local/zed$suffix.app"
|
|
tar -xzf "$temp/zed-linux-$arch.tar.gz" -C "$HOME/.local/"
|
|
|
|
# Setup ~/.local directories
|
|
mkdir -p "$HOME/.local/bin" "$HOME/.local/share/applications"
|
|
|
|
# Link the binary
|
|
if [ -f "$HOME/.local/zed$suffix.app/bin/zed" ]; then
|
|
ln -sf "$HOME/.local/zed$suffix.app/bin/zed" "$HOME/.local/bin/zed"
|
|
else
|
|
# support for versions before 0.139.x.
|
|
ln -sf "$HOME/.local/zed$suffix.app/bin/cli" "$HOME/.local/bin/zed"
|
|
fi
|
|
|
|
# Copy .desktop file
|
|
desktop_file_path="$HOME/.local/share/applications/${appid}.desktop"
|
|
cp "$HOME/.local/zed$suffix.app/share/applications/zed$suffix.desktop" "${desktop_file_path}"
|
|
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}"
|
|
}
|
|
|
|
macos() {
|
|
echo "Downloading Zed"
|
|
curl "https://zed.dev/api/releases/$channel/latest/Zed-$arch.dmg" > "$temp/Zed-$arch.dmg"
|
|
hdiutil attach -quiet "$temp/Zed-$arch.dmg" -mountpoint "$temp/mount"
|
|
app="$(cd "$temp/mount/"; echo *.app)"
|
|
echo "Installing $app"
|
|
if [ -d "/Applications/$app" ]; then
|
|
echo "Removing existing $app"
|
|
rm -rf "/Applications/$app"
|
|
fi
|
|
ditto "$temp/mount/$app" "/Applications/$app"
|
|
hdiutil detach -quiet "$temp/mount"
|
|
|
|
mkdir -p "$HOME/.local/bin"
|
|
# Link the binary
|
|
ln -sf "/Applications/$app/Contents/MacOS/cli" "$HOME/.local/bin/zed"
|
|
}
|
|
|
|
main "$@"
|