10 files changed, 60 insertions, 20 deletions
diff --git a/shells/ammonite/pkg-message b/shells/ammonite/pkg-message
index 7a2a2d6a2e47..eda1d943cdce 100644
--- a/shells/ammonite/pkg-message
+++ b/shells/ammonite/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To use ammonite as a shell you must(!) setup a configuration file
 ~/.ammonite/predef.sc with a least the following minimal content:
 
@@ -17,3 +20,6 @@ import shellSession._
 import ammonite.ops._
 import ammonite.shell._
 ammonite.shell.Configure(interp, repl, wd)
+EOM
+}
+]
diff --git a/shells/bash-completion/files/pkg-message.in b/shells/bash-completion/files/pkg-message.in
index f5c3c0203fd3..b9445fa231f7 100644
--- a/shells/bash-completion/files/pkg-message.in
+++ b/shells/bash-completion/files/pkg-message.in
@@ -1,6 +1,6 @@
-
-=====================================================================
-
+[
+{ type: install
+  message: <<EOM
 To enable the bash completion library, add the following to
 your .bashrc file:
 
@@ -8,6 +8,6 @@ your .bashrc file:
 	source %%RUNFILE%%
 
 See %%DOCSDIR%%/README.md for more information.
-
-=====================================================================
-
+EOM
+}
+]
diff --git a/shells/bash/files/pkg-message.in b/shells/bash/files/pkg-message.in
index 14dfcfe895f7..e0e633447e95 100644
--- a/shells/bash/files/pkg-message.in
+++ b/shells/bash/files/pkg-message.in
@@ -1,5 +1,6 @@
-======================================================================
-
+[
+{ type: install
+  message: <<EOM
 bash requires fdescfs(5) mounted on /dev/fd
 
 If you have not done it yet, please do the following:
@@ -9,5 +10,6 @@ If you have not done it yet, please do the following:
 To make it permanent, you need the following lines in /etc/fstab:
 
 	fdescfs	/dev/fd		fdescfs		rw,late	0	0
-
-======================================================================
+EOM
+}
+]
diff --git a/shells/fd/pkg-message b/shells/fd/pkg-message
index 6bf477081987..ce16ded61689 100644
--- a/shells/fd/pkg-message
+++ b/shells/fd/pkg-message
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 Read the document files in /usr/local/share/doc/fd, and use the
 example fd2rc files in /usr/local/etc.
+EOM
+}
+]
diff --git a/shells/flash/files/pkg-message.in b/shells/flash/files/pkg-message.in
index a5f713b325ce..18ea19433bdf 100644
--- a/shells/flash/files/pkg-message.in
+++ b/shells/flash/files/pkg-message.in
@@ -1,5 +1,9 @@
-  ------------------------ WARNING ------------------------
+[
+{ type: install
+  message: <<EOM
 This software is not yet ready-to-go on your system. You need
 to configure flash in %%PREFIX%%/lib/flash in order for it to
 work properly.
-  ---------------------------------------------------------
+EOM
+}
+]
diff --git a/shells/ibsh/files/pkg-message.in b/shells/ibsh/files/pkg-message.in
index 00278e259d6d..df3ce975c54c 100644
--- a/shells/ibsh/files/pkg-message.in
+++ b/shells/ibsh/files/pkg-message.in
@@ -1,9 +1,11 @@
-==========================================================================
-
+[
+{ type: install
+  message: <<EOM
 To use the shell:
 
 # echo %%PREFIX%%/bin/ibsh >> /etc/shells
 
 Also check %%PREFIX%%/etc/ibsh
-
-==========================================================================
+EOM
+}
+]
diff --git a/shells/zsh-antigen/files/pkg-message.in b/shells/zsh-antigen/files/pkg-message.in
index 7f44543fee12..4c196b8f9e56 100644
--- a/shells/zsh-antigen/files/pkg-message.in
+++ b/shells/zsh-antigen/files/pkg-message.in
@@ -1 +1,7 @@
+[
+{ type: install
+  message: <<EOM
 Antigen can be found at %%DATADIR%%/antigen.zsh
+EOM
+}
+]
diff --git a/shells/zsh-autosuggestions/files/pkg-message.in b/shells/zsh-autosuggestions/files/pkg-message.in
index b478ca7d39e5..1eb1a4a8fe16 100644
--- a/shells/zsh-autosuggestions/files/pkg-message.in
+++ b/shells/zsh-autosuggestions/files/pkg-message.in
@@ -1,5 +1,9 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 Add the line below to your .zshrc to enable auto suggestions.
 
 source %%DATADIR%%/zsh-autosuggestions.zsh
-================================================================================
+EOM
+}
+]
diff --git a/shells/zsh-navigation-tools/files/pkg-message.in b/shells/zsh-navigation-tools/files/pkg-message.in
index a563f75df2ea..2d6a014c6c8f 100644
--- a/shells/zsh-navigation-tools/files/pkg-message.in
+++ b/shells/zsh-navigation-tools/files/pkg-message.in
@@ -1,2 +1,8 @@
+[
+{ type: install
+  message: <<EOM
 To enable zsh-navigation-tools, add the following to your zshrc:
 source %%DATADIR%%/zsh-navigation-tools.plugin.zsh
+EOM
+}
+]
diff --git a/shells/zsh-syntax-highlighting/files/pkg-message.in b/shells/zsh-syntax-highlighting/files/pkg-message.in
index 2f718de92b61..8aba248b0fac 100644
--- a/shells/zsh-syntax-highlighting/files/pkg-message.in
+++ b/shells/zsh-syntax-highlighting/files/pkg-message.in
@@ -1,5 +1,9 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 Add the line below to *the end of* your .zshrc to enable highlighting.
 
 source %%DATADIR%%/zsh-syntax-highlighting.zsh
-================================================================================
+EOM
+}
+]