From f179b7b5d0f485b2617cef8a6ee6597f9ecc5a3b Mon Sep 17 00:00:00 2001 From: dmacias72 Date: Mon, 14 Mar 2016 00:35:32 -0600 Subject: [PATCH] update package locations --- plugins/libvirtwol.plg | 24 ++++++++++++++---------- plugins/libvirtwol.xml | 4 +++- plugins/speedtest.plg | 20 ++++++++++++-------- plugins/speedtest.xml | 4 +++- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/plugins/libvirtwol.plg b/plugins/libvirtwol.plg index 90ff9082..e23b9359 100755 --- a/plugins/libvirtwol.plg +++ b/plugins/libvirtwol.plg @@ -3,7 +3,7 @@ - + @@ -20,6 +20,8 @@ This Plugin installs libvirt wake on lan for unRaid 6.1 All dependencies are in --> +###2016.03.14 +- update package locations ###2016.03.12 - add dual package support for 6.1 and 6.2+ - add python 2.7.11 for 6.2+ @@ -57,13 +59,13 @@ This Plugin installs libvirt wake on lan for unRaid 6.1 All dependencies are in - -&gitURL;/packages/python-2.7.9-x86_64-1.txz + +&gitURL;/packages/6.1/python-2.7.9-x86_64-1.txz 7d5f6d12757c59e5f08ca25bd63aab78 - -&gitURL;/source/packages/python-2.7.11-x86_64-2.txz + +&gitURL;/packages/6.2/python-2.7.11-x86_64-2.txz 5ff7e4c8a7ef742fbf12a6ae25914df7 @@ -115,7 +117,9 @@ The 'install' script. #Verify unRAID Version source /etc/unraid-version -if [[ ${version:0:3} == 6.0 ]]; then +VER=${version:0:3} + +if [[ $VER == 6.0 ]]; then echo "unRAID version 6.1 or higher is required" exit 1 fi @@ -129,15 +133,15 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then rm &plgpath;/&plgname;.md5 exit 1 else - if [[ ${version:0:3} == 6.1 ]]; then + if [[ $VER == 6.1 ]]; then echo "\nInstalling dependencies for unRAID 6.1" - upgradepkg --install-new /boot/config/plugins/NerdPack/packages/python-2.7.9-x86_64-1.txz + upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz upgradepkg --install-new &plgpath;/libvirt-python-1.2.18-x86_64-1ponce.txz fi - if [[ ${version:0:3} == 6.2 ]]; then + if [[ $VER == 6.2 ]]; then echo "\nInstalling dependencies for unRAID 6.2" - upgradepkg --install-new /boot/config/plugins/NerdPack/packages/python-2.7.11-x86_64-2.txz + upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.11-x86_64-2.txz upgradepkg --install-new &plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz # restore VM Manager Menu diff --git a/plugins/libvirtwol.xml b/plugins/libvirtwol.xml index d17acdd1..2fcf5e57 100644 --- a/plugins/libvirtwol.xml +++ b/plugins/libvirtwol.xml @@ -11,8 +11,10 @@ Wake On Lan for Libvirt. Allows you to recieve a wake on lan packet to wake or s http://lime-technology.com/forum/index.php?topic=44017.0 https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/libvirtwol.png -2016-03-12 +2016-03-14 +###2016.03.14 +- update package locations ###2016.03.12 - add dual package support for 6.1 and 6.2+ - add python 2.7.11 for 6.2+ diff --git a/plugins/speedtest.plg b/plugins/speedtest.plg index cae017f9..8f261375 100755 --- a/plugins/speedtest.plg +++ b/plugins/speedtest.plg @@ -21,6 +21,8 @@ This Plugin installs speedtest-cli for unRaid 6.1 All dependencies are installe --> +###2016.03.14 +- update package locations ###2016.03.12 - fix install python 2.7.11 for unRAID 6.2+ - fix install python 2.7.9 for unRAID 6.1 @@ -118,13 +120,13 @@ The 'tablesorter' package file. d25fb1235efaa5f71c790b8d71ed7337 - -&gitURL;/packages/python-2.7.9-x86_64-1.txz + +&gitURL;/packages/6.1/python-2.7.9-x86_64-1.txz 7d5f6d12757c59e5f08ca25bd63aab78 - -&gitURL;/source/packages/python-2.7.11-x86_64-2.txz + +&gitURL;/packages/6.2/python-2.7.11-x86_64-2.txz 5ff7e4c8a7ef742fbf12a6ae25914df7 @@ -169,17 +171,19 @@ The 'install' script. #Verify unRAID Version source /etc/unraid-version -if [[ ${version:0:3} == 6.0 ]]; then +VER=${version:0:3} + +if [[ $VER == 6.0 ]]; then echo "unRAID version 6.1 or higher is required" exit 1 fi -if [[ ${version:0:3} == 6.1 ]]; then - upgradepkg --install-new /boot/config/plugins/NerdPack/packages/python-2.7.9-x86_64-1.txz +if [[ $VER == 6.1 ]]; then + upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.9-x86_64-1.txz fi if [[ ${version:0:3} == 6.2 ]]; then - upgradepkg --install-new /boot/config/plugins/NerdPack/packages/python-2.7.11-x86_64-2.txz + upgradepkg --install-new /boot/config/plugins/NerdPack/packages/$VER/python-2.7.11-x86_64-2.txz fi # Verify and install plugin package diff --git a/plugins/speedtest.xml b/plugins/speedtest.xml index f2a34a27..edf4d22e 100644 --- a/plugins/speedtest.xml +++ b/plugins/speedtest.xml @@ -11,8 +11,10 @@ This plugin interacts with the command line interface for testing internet bandw http://lime-technology.com/forum/index.php?topic=43500.0 https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/speedtest.png -2016-03-12 +2016-03-14 +###2016.03.14 +- update package locations ###2016.03.12 - fix install python 2.7.11 for unRAID 6.2+ - fix install python 2.7.9 for unRAID 6.1