martin/emacs-doom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: SCRIPT_DIR před cd; hledej patch v ~/.doom.d/patches/ a ~/.config/doom/patches/

Browse Source
This commit is contained in:
Daneel
2026-02-24 20:47:21 +01:00
parent b6bf19edfd
commit 39ab5992a6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/install_emacs_macos.sh
View File

@@ -7,6 +7,8 @@ NC='\033[0m'
ZOOM_PATCH_STATUS="přeskočen" ZOOM_PATCH_STATUS="přeskočen"
DOOM_STATUS="neznámý" 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 --- # --- Předběžné kontroly ---
if [[ "$(uname -s)" != "Darwin" ]]; then if [[ "$(uname -s)" != "Darwin" ]]; then
@@ -43,14 +45,20 @@ fi
# --- [3/7] Zoom accessibility patch --- # --- [3/7] Zoom accessibility patch ---
echo -e "${GREEN}[3/7] Zoom accessibility patch...${NC}" echo -e "${GREEN}[3/7] Zoom accessibility patch...${NC}"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PATCH_NAME="0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch"
PATCH_FILE="${SCRIPT_DIR}/../patches/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 cd ~/src/emacs
if grep -q UAZoomChangeFocus src/nsterm.m 2>/dev/null; then if grep -q UAZoomChangeFocus src/nsterm.m 2>/dev/null; then
echo " Patch already applied, skipping" echo " Patch already applied, skipping"
ZOOM_PATCH_STATUS="aplikován (již dříve)" ZOOM_PATCH_STATUS="aplikován (již dříve)"
elif [[ ! -f "$PATCH_FILE" ]]; then elif [[ -z "$PATCH_FILE" ]]; then
echo -e "${RED} Patch soubor neexistuje: $PATCH_FILE${NC}" 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í)" ZOOM_PATCH_STATUS="přeskočen (soubor chybí)"
else else
if git am --ignore-whitespace "$PATCH_FILE"; then if git am --ignore-whitespace "$PATCH_FILE"; then