Merge pull request #145 from chpock/add-shell

Add schemes for shell POSIX and shell bash

CHANGELOG.md

@@ -15,13 +15,14 @@
 - [csharp] recognise functions with nullable results
 
 ### Changed
-- Simplified catalog.xml. 
+- Simplified catalog.xml.
 - Use new xsd schema for catalog.xml.
 - Common.jar rename to common.zip
 - reformat proto.hrc and included files; changed namespace.
 - Tweak visual.hrd xml CData markup
 - remove obsolete from visual-rgb.hrd
 - [groovy] add .gradle as groovy
+- Use the new shell-posix schema for shell scripts by default
 
 ### Added
 - New package type of base - all packed. Hrc and hrd files in one archive. Directory 'auto' not in archive.
@@ -37,6 +38,8 @@
 - [csharp] support C# 11 raw strings
 - [cpp] add support for C++11 string literals
 - [asm] add new registers, blocks. New masks for filenames and firstline
+- [shell-posix] add a new schema for POSIX shell with block structures and error checking
+- [shell-bash] add a new schema for bash script based on shell-posix
 
 ## [1.2.0] - 2021-09-12
 

hrc/hrc/proto.hrc

@@ -591,11 +591,23 @@
     </prototype>
     <prototype name="shell" group="scripts" description="sh/ksh/bash script">
         <location link="scripts/sh.hrc" />
+        <firstline>/^\#(!\s*.+sh\b)/</firstline>
+    </prototype>
+    <prototype name="shell-posix" group="scripts" description="Shell Scripts (POSIX)">
+        <location link="scripts/shell-posix.hrc" />
         <filename>/\.(sh|spec)$/i</filename>
         <filename>/^PKGBUILD$/i</filename>
-        <filename>/\.(bash_|z)?profile/</filename>
-        <filename>/\.(ba|k|z)?shrc/</filename>
-        <firstline weight='2'>/^\#(!\s*.+sh\b)/</firstline>
+        <filename>/\.z?profile/</filename>
+        <filename>/\.(k|z)?shrc/</filename>
+        <firstline weight='3'>/^\#(!\s*.+sh\b)/</firstline>
+    </prototype>
+    <prototype name="shell-bash" group="scripts" description="Shell Scripts (bash)">
+        <location link="scripts/shell-bash.hrc" />
+        <filename weight='3'>/\.sh$/i</filename>
+        <filename weight='5'>/\.bash$/i</filename>
+        <filename>/\.bash_profile/</filename>
+        <filename>/\.bashrc/</filename>
+        <firstline weight='5'>/^\#!(\s*.+bash\b)/</firstline>
     </prototype>
     <prototype name="avisynth" group="scripts" description="AviSynth">
         <location link="scripts/avisynth.hrc" />