From 1b2eb67c0df410b57e1ed8025651156398e3fd79 Mon Sep 17 00:00:00 2001
From: Derek Macias <derekmacias@live.com>
Date: Fri, 11 Dec 2015 10:07:55 -0700
Subject: [PATCH] update package naming

---
 plugins/speedtest.plg | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/plugins/speedtest.plg b/plugins/speedtest.plg
index efedece7..1bd11595 100755
--- a/plugins/speedtest.plg
+++ b/plugins/speedtest.plg
@@ -4,12 +4,12 @@
 <!ENTITY name      "speedtest">
 <!ENTITY repo      "unRAID">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2015.12.10">
+<!ENTITY version   "2015.12.11">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/&repo;/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
 <!ENTITY pkgURL	 "&gitURL;/source/packages">
-<!ENTITY pkgs 	    "/boot/packages">
+<!ENTITY pkgs 	    "/boot/packages/">
 <!ENTITY plugin	 "/boot/config/plugins/&name;">
 <!ENTITY emhttp	 "/usr/local/emhttp/plugins/&name;">
 ]>
@@ -21,9 +21,10 @@ This Plugin installs speedtest-cli for unRaid 6.1  All dependencies are installe
 -->
 
 <CHANGES>
-###2015.12.10
+###2015.12.11
+- update package name
 - update install and remove scripts
-- changed plugin repo
+###2015.12.10
 - add date and time to table
 - add switchbuttons
 - update packages
@@ -43,30 +44,30 @@ This Plugin installs speedtest-cli for unRaid 6.1  All dependencies are installe
 <MD5>7d5f6d12757c59e5f08ca25bd63aab78</MD5>
 </FILE>
 <FILE Name="&pkgs;/pyOpenSSL-0.15.1-x86_64-1_slack.txz" Run="/sbin/upgradepkg --install-new">
-<URL>&pkgURL;/pyOpenSSL-0.15.1-x86_64-1_slack.txz</URL>
+<URL>&pkgURL;pyOpenSSL-0.15.1-x86_64-1_slack.txz</URL>
 <MD5>b422874df919df6baa10774bd2ddc2cc</MD5>
 </FILE>
 <FILE Name="&pkgs;/pysetuptools-18.2-x86_64-2_slack.txz" Run="/sbin/upgradepkg --install-new">
-<URL>&pkgURL;/pysetuptools-18.2-x86_64-2_slack.txz</URL>
+<URL>&pkgURL;pysetuptools-18.2-x86_64-2_slack.txz</URL>
 <MD5>8cb67f040f55b152042752c85b8c68d6</MD5>
 </FILE>
 <FILE Name="&pkgs;/pip-7.1.2-x86_64-1_slack.txz" Run="/sbin/upgradepkg --install-new">
-<URL>&pkgURL;/pip-7.1.2-x86_64-1_slack.txz</URL>
+<URL>&pkgURL;pip-7.1.2-x86_64-1_slack.txz</URL>
 <MD5>1e0a8d9e281cd075c175eca86aea2130</MD5>
 </FILE>
 
 <!--
 The 'plugin' package file.
 -->
-<FILE Name="&plugin;/&name;-&version;.txz">
-<URL>&gitURL;/archive/&name;-&version;.txz</URL>
+<FILE Name="&plugin;/&name;-&version;-x86_64-1.txz">
+<URL>&repo;/archive/&name;-&version;-x86_64-1.txz</URL>
 </FILE>
 
 <!--
 The 'plugin' package MD5 hash.
 -->
-<FILE Name="&plugin;/&name;-&version;.md5">
-<URL>&gitURL;/archive/&name;-&version;.md5</URL>
+<FILE Name="&plugin;/&name;-&version;-x86_64-1.md5">
+<URL>&repo;/archive/&name;-&version;-x86_64-1.md5</URL>
 </FILE>
 
 <!--
@@ -75,14 +76,15 @@ The 'install' script.
 <FILE Run="/bin/bash">
 <INLINE> 
 # Verify and install plugin package
-sum1=$(/usr/bin/md5sum &plugin;/&name;-&version;.txz)
-sum2=$(/usr/bin/cat &plugin;/&name;-&version;.md5)
+sum1=$(/usr/bin/md5sum &plugin;/&name;-&version;-x86_64-1.txz)
+sum2=$(/usr/bin/cat &plugin;/&name;-&version;-x86_64-1.md5)
 if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
   echo "Wrong 'plugin' package md5 hash."
-  rm -f &plugin;/&name;-&version;.*
+  rm &plugin;/&name;-&version;-x86_64-1.txz
+  rm &plugin;/&name;-&version;-x86_64-1.md5
   exit 1
 else
-  upgradepkg --install-new &plugin;/&name;-&version;.txz
+  upgradepkg --install-new &plugin;/&name;-&version;-x86_64-1.txz
 fi
 
 # Create symlink to xml on flash drive
@@ -113,9 +115,9 @@ The 'remove' script.
 -->
 <FILE Run="/bin/bash" Method="remove">
 <INLINE>
-removepkg &plugin;/&name;-&version;.txz
 rm -rf &emhttp;
-rm -f &plugin;/&name;-&version;.*
+removepkg &plugin;/&name;-&version;-x86_64-1.txz
+rm -f &plugin;/&name;-&version;-x86_64-1.txz
 
 echo ""
 echo "-----------------------------------------------------------"