From f655fbf52763e118120237ab27d2e4800951558b Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Fri, 19 Jun 2026 16:12:01 +0500 Subject: [PATCH] Get rid of lsb-release dependency (#16) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit У всех линуксов уже давно есть /etc/os-release, и можно на него опираться, упрощая жизнь и уменьшая количество зависимостей для конфига. Reviewed-on: https://code.pztrn.name/misc/zsh-config/pulls/16 Reviewed-by: Stanislav Nikitin Co-authored-by: Vladimir Hodakov Co-committed-by: Vladimir Hodakov --- zsh/03-vars.zsh | 6 +++--- zsh/plugins/autosuggestions.plugin.zsh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zsh/03-vars.zsh b/zsh/03-vars.zsh index 7c0e48c..a8a6640 100644 --- a/zsh/03-vars.zsh +++ b/zsh/03-vars.zsh @@ -6,9 +6,9 @@ OS_RELEASE=`uname -r` OS_ARCH=`uname -m` # Distro detection. -LSBRELEASE=$(which lsb_release) -if [ $? -eq 0 ]; then - DISTRO=`lsb_release -i -s` +if [[ -f /etc/os-release ]]; then + . /etc/os-release + DISTRO=${ID} else # BSDs OS and macOS can be detected via uname. DISTRO=${OS} diff --git a/zsh/plugins/autosuggestions.plugin.zsh b/zsh/plugins/autosuggestions.plugin.zsh index 026d95c..37fcad7 100644 --- a/zsh/plugins/autosuggestions.plugin.zsh +++ b/zsh/plugins/autosuggestions.plugin.zsh @@ -1,10 +1,10 @@ AUTOSUGGESTIONS_PATH="/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh" -if [ "${DISTRO}" = "Arch" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi -if [ "${DISTRO}" = "EnveavourOS" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi +if [ "${DISTRO}" = "arch" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi +if [ "${DISTRO}" = "endeavouros" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "arm64" ]]; then AUTOSUGGESTIONS_PATH="/opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "x86_64" ]]; then AUTOSUGGESTIONS_PATH="/usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi -if [ "${DISTRO}" = "VoidLinux" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions.zsh"; fi +if [ "${DISTRO}" = "voidlinux" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions.zsh"; fi if [ -f "${AUTOSUGGESTIONS_PATH}" ]; then source "${AUTOSUGGESTIONS_PATH}"