Index: externals/Harpy/Tools/sign.eagle
==================================================================
--- externals/Harpy/Tools/sign.eagle
+++ externals/Harpy/Tools/sign.eagle
@@ -159,11 +159,11 @@
   set data [readFile $fileName]
   set beginIndex [string first $prefixWithSpacing $data]
 
   if {$beginIndex == -1} then {
     set prefixWithSpacing $::embedPrefix
-    set beginIndex [string first $prefixWithSpacing $data]
+    set beginIndex [string last $prefixWithSpacing $data]
   }
 
   if {$beginIndex != -1} then {
     set endIndex [string first $::embedSuffix $data \
         [expr {$beginIndex + [string length $prefixWithSpacing]}]]
@@ -415,11 +415,12 @@
 
   #
   # NOTE: The existing embedded certificate, if any, must be
   #       removed prior to signing the (script?) file.
   #
-  if {$shouldEmbed} then {
+  if {$shouldEmbed && \
+      ![info exists no(removeEmbeddedCertificate)]} then {
     removeEmbeddedCertificate $fileName
   }
 
   #
   # NOTE: If the file is an XML file, assume it is a license
@@ -749,10 +750,17 @@
 
   #
   # HOOK: Script completion.
   #
   catch {certificate_hook phase3}
+
+  #
+  # NOTE: Cleanup the external embedded certificate file, if any.
+  #
+  if {$shouldEmbed} then {
+    catch {file delete -force $certificateFile}
+  }
 
   #
   # NOTE: Play nice and cleanup all the variables we created during the
   #       whole the signing process.
   #

Index: externals/Harpy/Tools/sign.eagle.asc
==================================================================
--- externals/Harpy/Tools/sign.eagle.asc
+++ externals/Harpy/Tools/sign.eagle.asc
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: Eagle Package Repository
 
-iQIcBAABCAAGBQJhDyEHAAoJEFAslq9JXcLZ0SoP/RVqrqq6F70SXMxlfLoh3+1M
-dKhfdrqSbo2D3ple9iOdjmkpC3U1YIDUE0wQoX5s8inNHJk1/VWT8cuObahcjV6a
-3KBObzAeo/3yeUQc+6icXGV2tiUHk1VaIjmv7Z2EnXWVX0qhABlAU3WU3ZwhA8/U
-B6q0DMFQILcrbewbOJmbC5e3RQJX69MJQblfeIEwKzwdvuQ79yRMux4dW4XAvcFb
-qX4nYbpIBQiMMEIoDPR/SHudXtJLizWsi2HHN2MIy9iNimedwAyu1+jSBAaFzd5d
-z3mMNUQFH2Ej2B84i/sXrKudeoj0H6v5Aiha7mpl5B6mVDrpW0oY2THiIpb8TCHx
-vrgNBwf1IcyBBytltL5Bw2gEWqo+q6pnzA9qeoLcgS7L1lQv5xnwwS44Q7ttBuDf
-QFQgPvP6oLcrwsIksUI3c0kKiVruj9Fi8dcAdEuga9DKDsgvqbIm93q67HQ6+wNR
-/SVEy+JYbblZUY6OF5VpCUxo51+kuCUOmzfcDj6P+Ff6VvA5gX347YlqvpLylc0k
-UhYrYgWsoz8/jbav95ttfMaOOBjuviS2nwgbfMGydngBflXlpW0z3Fd4Br+HrNrw
-0cOwlAVnmwBhLmVH4mhgyVb7nd1IUJl1aVdksnUXXk104/PWgW8RkA/Qf5l62N6k
-Nf6MbA+UShDbzmrEy3XT
-=Ad7Q
+iQIcBAABCAAGBQJi6c/yAAoJEFAslq9JXcLZt7EQAJiqKnWhMb63LL2+tCBfza9Y
+hPcQKyI1z5FxxrkpphxwX+ULH0/gQvIFXmRrvxpmZCgTZImq8wjDWbqOgWIe52l5
+40Pl4tqfZXsXvpafi6hT1R3D7/VQlvyvlIJCemFwD8VEiPUaR4VAMmF5jFyEZG0v
+gimNcIHz7nTL4Fp9FKT9JtoyjJfP6z5WNv6l/GeE1WcuAzKtClxl9KY9QJrb4buH
+9TDhSVD1iXWDY4LHuRm3/YvvvVpTnKV/DSpNXxXteCxHc+EcW+PwZUpmMpLgGRs+
+tq/nS4CImZo+rDbJeWRnPpTX5mzcymWZ0xWQ7UOZU0p5dwhMKLfbrJPqtaAopyVQ
+rlNvHMNAeJSX4XLKBV3sfkpZZXMMZ07Acs85t3XGuvzO1flvugQg4dz/Un+7sYxK
+e2OWCTaFVS0kV0vbiDhQkLzepb+kRzIhyCX13wWwkR4SHo1MGkU0GhMtcHisX87/
+L5SNHwmWKDw9Z+WAKs4U67BwFEpDKWNrp/R4RVsVIFK2hYP8lEGjtZq83MyDvQbB
+uCunpBYe47GRZ4XjJ22Xe1maHO0rQrzb3YRfOrkm4Yd9LWHz4POoO9gbtJldfwy1
+UvAmpOBVNKCTm7hADXWQxYbaaFb4A7sXjT6EKKzu08/EcU2YVoTWJ0prCYVsU5Oz
+/Lg5ZtU/GOHe9LocXZAW
+=AU+n
 -----END PGP SIGNATURE-----

Index: externals/Harpy/Tools/sign.eagle.harpy
==================================================================
--- externals/Harpy/Tools/sign.eagle.harpy
+++ externals/Harpy/Tools/sign.eagle.harpy
@@ -19,50 +19,50 @@
 <Certificate xmlns="https://eagle.to/2011/harpy"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Protocol>None</Protocol>
   <Vendor>Mistachkin Systems</Vendor>
-  <Id>2659fc4e-015f-47e5-9459-8bc67c2e4a14</Id>
+  <Id>6be4411d-36ef-4292-a8d0-3a6ec8be91af</Id>
   <HashAlgorithm>SHA512</HashAlgorithm>
   <EntityType>Script</EntityType>
-  <TimeStamp>2021-04-11T00:56:07.0511539Z</TimeStamp>
+  <TimeStamp>2022-08-03T01:28:51.2556653Z</TimeStamp>
   <Duration>-1.00:00:00</Duration>
   <Key>0x9559f6017247e3e2</Key>
   <Signature>
-    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
+    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
   </Signature>
 </Certificate>

Index: externals/Harpy/Tools/sign.eagle.harpy.asc
==================================================================
--- externals/Harpy/Tools/sign.eagle.harpy.asc
+++ externals/Harpy/Tools/sign.eagle.harpy.asc
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: Eagle Package Repository
 
-iQIcBAABCAAGBQJhDyEIAAoJEFAslq9JXcLZZukP/i1TeSczkf85n3ZaYeEyxvng
-Cip/0xGa89PFesdKDpwcYKbMfK3qB+VG1UvutCF2HeV1pAv3hbCgEF9WGFZmO2dH
-xn1txousvuHEDiABHkRBMBF+XwtjITlxrQGGTN+lyklijb2RaHvq0DIsd/U+okV9
-FVLCC46Czetn8ykhC0JS+7S4Yol7ZZFOnmf5QcNbw+bkHSwjYVF1LRCtymSdK5ka
-sbkNRqV+Xddh7liTuncTP3mgD9p1iWuYbMZAOPFtkZ16zXl5By5F0Xiry6AMyoGg
-lDU7lGc3fywOSNWTIcyGlHy0T8Q97ZRIXpnMEKN2tMypf4L9/iYGUWeQl8ZVf+Lc
-B9hQOPW3FqZN+mYEcfNeTfGJaB5+gYQRtGiU+SSfUcZuQnMs18RsiEx++hqE7OTG
-3x1ZNiTEzXyPvqxVskhlGPSqGrSPzudvBTeymVlaUWIeJfEDD1jrPOykAvGWeV8Q
-X2LHB+RJ/f8nibu2F+3TOxKqUi9LYfSayt6tDsurgmsZSQb7crRTF6MIHEWwzEEi
-8Ia+2xouaOM3jsJTy7AOlPNKtMFhaVxb1IpA3eQLke3ze60adrS0sbwrqyhxRaKG
-KGFT5f5wx943YvvCnwPwlvFuJgp7HC+J2ER32ge+MdKb6HnJuA5QzkgakLQHmvm1
-WFY8jH8hyQPZc4hSnXOu
-=P/9F
+iQIcBAABCAAGBQJi6c/zAAoJEFAslq9JXcLZ7BUP/RXqr/O/XkOgaNNY/fTKHmJS
+MF3aGdnmkO8e3ZYG8c4x55Ms9fj4L1YfDxq1n/2QmNZTkmgrNM7OKKiZpTphqPtV
+Az7lK3Pb5CQFAcsbtERXVHUyFprAq0slvKrqXtoagdCSLNY5qO7HXJ1wSMCn8dbx
+xa4xF1imH2rBA6CdFaz/BrYz0eUhK58vf0sri28rzgGd99iHvzN9KgPPIlTTJPYV
+L6a2Sin+OoRtAYnxNTDke1lrQwE1zLaYpCMnBJxIZ2gX0ku5bUQf5x+4iRxSz0Vg
+3n42DhIYJDJezdP5In7Fg87RvZivYFVpAMWBDJTLXlkQrMgmQaMOlUKrLV3u2maq
+0NPcOK40s/M1IOEf2o5uZrs1nBqGVrTv/2Kr+qnGmSXJc+MiDMUSX87bqR//kLiY
+vJOkUlb20eH5hhva4GE9YG7jKdYmB+08CsexWcZCi1r5K1FFvbb5q5KffqGzaPgk
+Er+PeRkCJ4LY7+ceOeIG8lxJqUqsgUDnkD/uKE9fnc6mnWy5IzMdOHc9efY/uZ2r
+Hxova+Gv1D0pgD4UqxgGKwDGpPK+l5jvjIRR0SOI12MDt0tVXRipVRRk+T55YJhi
+tdD1C5WjOokyGBVkBPvBkSjKB0ZWL5yWoKjfievWiffkndrvRg2u09X0f0UnVfCU
+3Z9znvRJv31x37PcLLpz
+=85eb
 -----END PGP SIGNATURE-----