From 39ab5992a6775a3167f596e67a2409315b3aad9e Mon Sep 17 00:00:00 2001 From: Daneel Date: Tue, 24 Feb 2026 20:47:21 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20SCRIPT=5FDIR=20p=C5=99ed=20cd;=20hledej?= =?UTF-8?q?=20patch=20v=20~/.doom.d/patches/=20a=20~/.config/doom/patches/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install_emacs_macos.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/install_emacs_macos.sh b/scripts/install_emacs_macos.sh index 0e48001..68c4ef1 100755 --- a/scripts/install_emacs_macos.sh +++ b/scripts/install_emacs_macos.sh @@ -7,6 +7,8 @@ NC='\033[0m' ZOOM_PATCH_STATUS="přeskočen" DOOM_STATUS="neznámý" +# Zachyť cestu ke skriptu PŘED jakýmkoli cd +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # --- Předběžné kontroly --- if [[ "$(uname -s)" != "Darwin" ]]; then @@ -43,14 +45,20 @@ fi # --- [3/7] Zoom accessibility patch --- echo -e "${GREEN}[3/7] Zoom accessibility patch...${NC}" -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PATCH_FILE="${SCRIPT_DIR}/../patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch" +PATCH_NAME="0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch" +PATCH_FILE="" +for _dir in "${SCRIPT_DIR}/../patches" "${HOME}/.doom.d/patches" "${HOME}/.config/doom/patches"; do + if [[ -f "${_dir}/${PATCH_NAME}" ]]; then + PATCH_FILE="${_dir}/${PATCH_NAME}" + break + fi +done cd ~/src/emacs if grep -q UAZoomChangeFocus src/nsterm.m 2>/dev/null; then echo " Patch already applied, skipping" ZOOM_PATCH_STATUS="aplikován (již dříve)" -elif [[ ! -f "$PATCH_FILE" ]]; then - echo -e "${RED} Patch soubor neexistuje: $PATCH_FILE${NC}" +elif [[ -z "$PATCH_FILE" ]]; then + echo -e "${RED} Patch soubor nenalezen v ~/.doom.d/patches/, ~/.config/doom/patches/ ani vedle skriptu${NC}" ZOOM_PATCH_STATUS="přeskočen (soubor chybí)" else if git am --ignore-whitespace "$PATCH_FILE"; then