Embed plugin guards

3 files changed, 9 insertions, 17 deletions

diff --git a/build b/build
index d8f38262..052b3a8a 100755
--- a/build
+++ b/build
@@ -102,14 +102,16 @@ copy_file() {
   fi
 
   mkdir -p "${file_path}"
-  touch "$file_in_dst"
 
-  # Use comma instead of / to handle cases like c/c++
-  if [[ "${package_name}" == "jsx" ]]; then
-    sed -e "s,%%PACK%%,${package_name}," -e "/%%CONTENT%%/{r ${file_in_tmp}" -e "d;}" plugin_guard_jsx.vim.template >> "$file_in_dst"
-  else
-    sed -e "s,%%PACK%%,${package_name}," -e "/%%CONTENT%%/{r ${file_in_tmp}" -e "d;}" plugin_guard.vim.template >> "$file_in_dst"
-  fi
+  (
+    if [[ "${package_name}" == "jsx" ]]; then
+      printf "if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)\n\n"
+    else
+      printf "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '$package_name') == -1\n\n"
+    fi
+    cat "$file_in_tmp"
+    printf "\nendif\n"
+  ) >> "$file_in_dst"
 }
 
 update_readme() {
diff --git a/plugin_guard.vim.template b/plugin_guard.vim.template
deleted file mode 100644
index b2e6c31e..00000000
--- a/plugin_guard.vim.template
+++ /dev/null
@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '%%PACK%%') == -1
-
-%%CONTENT%%
-
-endif
diff --git a/plugin_guard_jsx.vim.template b/plugin_guard_jsx.vim.template
deleted file mode 100644
index 7b310c69..00000000
--- a/plugin_guard_jsx.vim.template
+++ /dev/null
@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-%%CONTENT%%
-
-endif