diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-26 22:22:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 22:22:56 +0800 |
| commit | d3a22ff242526e36e6e5b76fdc70656dd3d7ca31 (patch) | |
| tree | 437987e30c61ba278b4d3da74a1ad5471a67a762 /scripts/vim-patch.sh | |
| parent | a24dd0392bc4e00b1cb2a1b9efe62045924489ae (diff) | |
| download | rneovim-d3a22ff242526e36e6e5b76fdc70656dd3d7ca31.tar.gz rneovim-d3a22ff242526e36e6e5b76fdc70656dd3d7ca31.tar.bz2 rneovim-d3a22ff242526e36e6e5b76fdc70656dd3d7ca31.zip | |
build(vim-patch.sh): use bundled uncrustify (#23770)
Diffstat (limited to 'scripts/vim-patch.sh')
| -rwxr-xr-x | scripts/vim-patch.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index df0af72fdb..7af055640b 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -297,7 +297,7 @@ uncrustify_patch() { exit 1 } - local patch_path=$NVIM_SOURCE_DIR/build/vim_patch + local patch_path="$NVIM_SOURCE_DIR"/build/vim_patch rm -rf "$patch_path" mkdir -p "$patch_path"/{a,b} @@ -314,7 +314,7 @@ uncrustify_patch() { # than once. This is obviously a bug that needs to be fixed on uncrustify's # end, but in the meantime this workaround is sufficient. for _ in {1..2}; do - uncrustify -c "$NVIM_SOURCE_DIR"/src/uncrustify.cfg -q --replace --no-backup "$patch_path"/{a,b}/src/*.[ch] + "$NVIM_SOURCE_DIR"/build/usr/bin/uncrustify -c "$NVIM_SOURCE_DIR"/src/uncrustify.cfg -q --replace --no-backup "$patch_path"/{a,b}/src/*.[ch] done (cd "$patch_path" && (git --no-pager diff --no-index --no-prefix --patch --unified=5 --color=never a/ b/ || true)) @@ -328,7 +328,7 @@ get_vimpatch() { msg_ok "Found Vim revision '${vim_commit}'." local patch_content - if check_executable uncrustify; then + if check_executable "$NVIM_SOURCE_DIR"/build/usr/bin/uncrustify; then patch_content="$(uncrustify_patch "${vim_commit}")" else patch_content="$(git --no-pager show --unified=5 --color=never -1 --pretty=medium "${vim_commit}")" |