From b285b1ae9957006fd3e4b9536f402108ed0fb395 Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Sat, 7 May 2022 03:55:38 +0100
Subject: [PATCH] update plugin script

---
 dev.unraid-bat.plg | 54 +++++++++++++++++++++++++++++++++++-----------
 unraid-bat.plg     | 54 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/dev.unraid-bat.plg b/dev.unraid-bat.plg
index a344881..4369bb0 100644
--- a/dev.unraid-bat.plg
+++ b/dev.unraid-bat.plg
@@ -7,7 +7,7 @@
   <!ENTITY gitURL     "https://git.panaetius.co.uk/&org;/&name;">
   <!ENTITY pluginURL  "&gitURL;/raw/branch/master/&name;.plg">
   <!ENTITY releaseURL "&gitURL;/releases/download/&version;/&name;-&version;.txz">
-  <!ENTITY md5        "275af43e0fad8098a6da994b6383044b">
+  <!ENTITY releaseMD5URL "&gitURL;/releases/download/&version;/md5sum.txt">
   <!ENTITY plugin     "/boot/config/plugins/&name;">
   <!ENTITY emhttp     "/usr/local/emhttp/plugins/&name;">
 ]>
@@ -21,28 +21,56 @@
 
 </CHANGES>
 
+
+<FILE Name="&plugin;/&name;-&version;.txz">
+<URL>&releaseURL;</URL>
+</FILE>
+
+<FILE Name="&plugin;/&name;-&version;.md5">
+<URL>&releaseMD5URL;</URL>
+</FILE>
+
 <FILE Run="/bin/bash">
 <INLINE>
-<!-- remove previous version if present -->
-file=$(/usr/bin/ls /boot/config/plugins/&name;/&name;*.txz | grep -v '&version;')
-if [ ! -z "$file" ]
+local_package_file_md5=$(/usr/bin/md5sum &plugin;/&name;-&version;.txz)
+remote_package_file_md5=$(/usr/bin/cat &name;-&version;.md5)
+
+if test $local_package_file_md5 != remote_package_file_md5
 then
-  filename=$(basename -- $file)
-  previous="${filename%.*}"
-  echo "previous version ${previous} found - uninstalling"
-  removepkg $previous
-  rm -f $file
+    echo "*** md5 of download package does not match - removing files and exiting ***"
+    rm &plugin;/&name;-&version;.txz
+    rm &name;-&version;.md5
+    exit 1
 else
-  echo "no previous version found - first time install"
+    echo "*** md5 check successful ***"
 fi
 </INLINE>
 </FILE>
 
-<FILE Name="/boot/config/plugins/&name;/&name;-&version;.txz" Run="upgradepkg --install-new">
-<URL>&releaseURL;</URL>
-<MD5>&md5;</MD5>
+<FILE Run="/bin/bash">
+<INLINE>
+    <!-- remove previous version if present -->
+    file=$(/usr/bin/ls /boot/config/plugins/&name;/&name;*.txz | grep -v '&version;')
+    if [ ! -z "$file" ]
+    then
+    filename=$(basename -- $file)
+    previous="${filename%.*}"
+    echo "*** previous version ${previous} found - uninstalling ***"
+    removepkg $previous
+    rm -f $file
+    else
+    echo "*** no previous version found - first time install ***"
+    fi
+</INLINE>
 </FILE>
 
+<FILE Run="/bin/bash">
+<INLINE>
+upgradepkg --install-new &plugin;/&name;-&version;.txz
+</INLINE>
+</FILE>
+
+
 <FILE Name="&emhttp;/README.md">
 <INLINE>
   **bat**
diff --git a/unraid-bat.plg b/unraid-bat.plg
index daddb0d..6642b22 100644
--- a/unraid-bat.plg
+++ b/unraid-bat.plg
@@ -7,7 +7,7 @@
   <!ENTITY gitURL     "https://github.com/&org;/&name;">
   <!ENTITY pluginURL  "&gitURL;/raw/master/&name;.plg">
   <!ENTITY releaseURL "&gitURL;/releases/download/&version;/&name;-&version;.txz">
-  <!ENTITY md5        "275af43e0fad8098a6da994b6383044b">
+  <!ENTITY releaseMD5URL "&gitURL;/releases/download/&version;/md5sum.txt">
   <!ENTITY plugin     "/boot/config/plugins/&name;">
   <!ENTITY emhttp     "/usr/local/emhttp/plugins/&name;">
 ]>
@@ -20,28 +20,56 @@
 
 </CHANGES>
 
+
+<FILE Name="&plugin;/&name;-&version;.txz">
+<URL>&releaseURL;</URL>
+</FILE>
+
+<FILE Name="&plugin;/&name;-&version;.md5">
+<URL>&releaseMD5URL;</URL>
+</FILE>
+
 <FILE Run="/bin/bash">
 <INLINE>
-<!-- remove previous version if present -->
-file=$(/usr/bin/ls /boot/config/plugins/&name;/&name;*.txz | grep -v '&version;')
-if [ ! -z "$file" ]
+local_package_file_md5=$(/usr/bin/md5sum &plugin;/&name;-&version;.txz)
+remote_package_file_md5=$(/usr/bin/cat &name;-&version;.md5)
+
+if test $local_package_file_md5 != remote_package_file_md5
 then
-  filename=$(basename -- $file)
-  previous="${filename%.*}"
-  echo "previous version ${previous} found - uninstalling"
-  removepkg $previous
-  rm -f $file
+    echo "*** md5 of download package does not match - removing files and exiting ***"
+    rm &plugin;/&name;-&version;.txz
+    rm &name;-&version;.md5
+    exit 1
 else
-  echo "no previous version found - first time install"
+    echo "*** md5 check successful ***"
 fi
 </INLINE>
 </FILE>
 
-<FILE Name="/boot/config/plugins/&name;/&name;-&version;.txz" Run="upgradepkg --install-new">
-<URL>&releaseURL;</URL>
-<MD5>&md5;</MD5>
+<FILE Run="/bin/bash">
+<INLINE>
+    <!-- remove previous version if present -->
+    file=$(/usr/bin/ls /boot/config/plugins/&name;/&name;*.txz | grep -v '&version;')
+    if [ ! -z "$file" ]
+    then
+    filename=$(basename -- $file)
+    previous="${filename%.*}"
+    echo "*** previous version ${previous} found - uninstalling ***"
+    removepkg $previous
+    rm -f $file
+    else
+    echo "*** no previous version found - first time install ***"
+    fi
+</INLINE>
 </FILE>
 
+<FILE Run="/bin/bash">
+<INLINE>
+upgradepkg --install-new &plugin;/&name;-&version;.txz
+</INLINE>
+</FILE>
+
+
 <FILE Name="&emhttp;/README.md">
 <INLINE>
 **bat**