fix: keep cursor shim working in AppImage terminals #21
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| #!/bin/sh | ||
| # Ensure supported interactive shells source cursor-installer's PATH helper. | ||
| set -eu | ||
|
|
||
| ACTION="${1:-ensure}" | ||
| LIB_DIR="${HOME}/.local/share/cursor-installer" | ||
| SHELL_PATH_SCRIPT="${SHELL_PATH_SCRIPT:-$LIB_DIR/shell-path.sh}" | ||
| START_MARKER="# >>> cursor-installer path >>>" | ||
| END_MARKER="# <<< cursor-installer path <<<" | ||
|
|
||
| build_source_block() { | ||
| cat <<EOF | ||
| $START_MARKER | ||
| if [ -f "$SHELL_PATH_SCRIPT" ]; then | ||
| . "$SHELL_PATH_SCRIPT" | ||
| fi | ||
| $END_MARKER | ||
| EOF | ||
| } | ||
|
|
||
| print_target_files() { | ||
| if [ -n "${TARGET_SHELL_FILES:-}" ]; then | ||
| old_IFS="$IFS" | ||
| IFS=: | ||
| for file in $TARGET_SHELL_FILES; do | ||
| [ -n "$file" ] && printf '%s\n' "$file" | ||
| done | ||
| IFS="$old_IFS" | ||
| return 0 | ||
| fi | ||
|
|
||
| if [ -n "${TARGET_SHELL_RC:-}" ]; then | ||
| printf '%s\n' "$TARGET_SHELL_RC" | ||
| return 0 | ||
| fi | ||
|
|
||
| shell_name=$(basename "${SHELL:-}") | ||
| case "$shell_name" in | ||
| bash) | ||
| printf '%s\n' "$HOME/.bashrc" | ||
|
Comment on lines
+37
to
+40
There was a problem hiding this comment.
Useful? React with 👍 / 👎. |
||
| ;; | ||
| zsh) | ||
| printf '%s\n' "$HOME/.zshrc" | ||
| ;; | ||
| sh|dash|ksh) | ||
| printf '%s\n' "$HOME/.profile" | ||
| ;; | ||
| *) | ||
| echo "Skipping shell PATH setup; unsupported shell: ${SHELL:-unknown}" >&2 | ||
| return 1 | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| strip_managed_block() { | ||
| file="$1" | ||
| tmp="$2" | ||
|
|
||
| if [ -f "$file" ]; then | ||
| awk -v start="$START_MARKER" -v end="$END_MARKER" ' | ||
| $0 == start { skip = 1; next } | ||
| skip && $0 == end { skip = 0; next } | ||
| !skip { print } | ||
| ' "$file" > "$tmp" | ||
| else | ||
| : > "$tmp" | ||
| fi | ||
| } | ||
|
|
||
| trim_trailing_blank_lines() { | ||
| trim_file="$1" | ||
| trimmed_file=$(mktemp) | ||
|
|
||
| awk ' | ||
| { lines[NR] = $0 } | ||
| END { | ||
| last = NR | ||
| while (last > 0 && lines[last] ~ /^[[:space:]]*$/) { | ||
| last-- | ||
| } | ||
| for (i = 1; i <= last; i++) { | ||
| print lines[i] | ||
| } | ||
| } | ||
| ' "$trim_file" > "$trimmed_file" | ||
|
|
||
| mv "$trimmed_file" "$trim_file" | ||
| } | ||
|
|
||
| write_updated_file() { | ||
| source_tmp="$1" | ||
| destination_file="$2" | ||
|
|
||
| if [ -e "$destination_file" ] || [ -L "$destination_file" ]; then | ||
| cat "$source_tmp" > "$destination_file" | ||
| rm -f "$source_tmp" | ||
| return 0 | ||
| fi | ||
|
|
||
| mv "$source_tmp" "$destination_file" | ||
| } | ||
|
|
||
| ensure_block() { | ||
| file="$1" | ||
| tmp=$(mktemp) | ||
| mkdir -p "$(dirname "$file")" | ||
| strip_managed_block "$file" "$tmp" | ||
| trim_trailing_blank_lines "$tmp" | ||
|
|
||
| if [ -s "$tmp" ]; then | ||
| printf '\n' >> "$tmp" | ||
| fi | ||
|
|
||
| build_source_block >> "$tmp" | ||
|
|
||
| if [ -f "$file" ] && cmp -s "$tmp" "$file"; then | ||
| rm -f "$tmp" | ||
| echo "Shell PATH setup already present in $file" | ||
| return 0 | ||
| fi | ||
|
|
||
| write_updated_file "$tmp" "$file" | ||
| echo "Ensured shell PATH setup in $file" | ||
| } | ||
|
|
||
| remove_block() { | ||
| file="$1" | ||
| [ -f "$file" ] || return 0 | ||
|
|
||
| tmp=$(mktemp) | ||
| strip_managed_block "$file" "$tmp" | ||
|
|
||
| if cmp -s "$tmp" "$file"; then | ||
| rm -f "$tmp" | ||
| return 0 | ||
| fi | ||
|
|
||
| write_updated_file "$tmp" "$file" | ||
| echo "Removed shell PATH setup from $file" | ||
| } | ||
|
|
||
| if [ "$ACTION" = "ensure" ] && [ ! -f "$SHELL_PATH_SCRIPT" ]; then | ||
| echo "Error: shell-path.sh source not found at $SHELL_PATH_SCRIPT" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if ! target_files=$(print_target_files); then | ||
| exit 0 | ||
| fi | ||
|
|
||
| printf '%s\n' "$target_files" | while IFS= read -r file; do | ||
| [ -n "$file" ] || continue | ||
|
|
||
| case "$ACTION" in | ||
| ensure) | ||
| ensure_block "$file" | ||
| ;; | ||
| --remove|remove) | ||
| remove_block "$file" | ||
| ;; | ||
| *) | ||
| echo "Unknown action: $ACTION" >&2 | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| done | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
update_cursornow callsrefresh_shell_path_assetsunconditionally, but installed environments can still source an older~/.local/share/cursor-installer/lib.shthat predates this API. In that mixed-version state,cursor-installer --updateexits withcommand not foundbefore any update logic runs, so users are left with a broken updater until lib assets are manually repaired. Add a compatibility guard (or force-refreshlib.sh) before invoking new helper functions.Useful? React with 👍 / 👎.