us pnpx + find vim

aklt · Aug 25, 2024 · daca740 · daca740
1 parent 92d018a
commit daca740
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/makefile b/makefile
@@ -31,7 +31,7 @@ index.orig.html: index.sh $(PRE) $(UML)
 	bash ./index.sh $(PRE) > $@
 
 index.html: index.orig.html
-	npx html-minifier-terser --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype \
+	pnpx html-minifier-terser --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype \
 	                         --minify-urls --minify-js true --minify-css true $< > $@
 
 %.pre.html %.syntax.css: %.uml

diff --git a/tohtml.sh b/tohtml.sh
@@ -17,16 +17,15 @@ fi
 
 toHtml="$VIM_TO_HTML"
 if ! [ -e "$toHtml" ]; then
-  toHtml="$HOME/install/share/vim/vim90/syntax/2html.vim"
-fi
-if ! [ -e "$toHtml" ]; then
-  toHtml="/usr/share/vim/vim90/syntax/2html.vim"
-fi
-if ! [ -e "$toHtml" ]; then
-  toHtml="$HOME/install/share/vim/vim82/syntax/2html.vim"
-fi
-if ! [ -e "$toHtml" ]; then
-  toHtml="/usr/share/vim/vim82/syntax/2html.vim"
+  for ver in 91 90 82 81; do
+    toHtml="$HOME/install/share/vim/vim$ver/syntax/2html.vim"
+    if ! [ -e "$toHtml" ]; then
+      toHtml="/usr/share/vim/vim$ver/syntax/2html.vim"
+    fi
+    if [ -e "$toHtml" ]; then
+      break
+    fi
+  done
 fi
 if ! [ -e "$toHtml" ]; then
   echo "Cannot find 2html.vim script, set VIM_TO_HTML variable"

diff --git a/vim/pack/test/opt/plantuml-syntax b/vim/pack/test/opt/plantuml-syntax