From 90b60669754bd0259a9b99d3a0b6db21326c888c Mon Sep 17 00:00:00 2001
From: Derek Macias <derekmacias@live.com>
Date: Wed, 30 Dec 2015 03:00:11 -0700
Subject: [PATCH] update plg files, add wakeonlan

---
 plugins/NerdPack.plg                          |  8 +++-
 plugins/NerdPack.xml                          |  4 +-
 plugins/ipmitool-plugin.plg                   |  6 ++-
 plugins/ipmitool-plugin.xml                   |  4 +-
 plugins/shellinabox-plugin.plg                |  6 ++-
 plugins/shellinabox-plugin.xml                |  4 +-
 source/NerdPack/install/slack-desc~           | 19 ----------
 .../NerdPack/include/PackageRemove.php        |  5 ---
 .../NerdPack/include/PackageUpdate.php        | 38 -------------------
 9 files changed, 24 insertions(+), 70 deletions(-)
 delete mode 100644 source/NerdPack/install/slack-desc~
 delete mode 100644 source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageRemove.php
 delete mode 100644 source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageUpdate.php

diff --git a/plugins/NerdPack.plg b/plugins/NerdPack.plg
index 91ac69ba..abf81897 100644
--- a/plugins/NerdPack.plg
+++ b/plugins/NerdPack.plg
@@ -3,7 +3,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "NerdPack">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2015.12.15a">
+<!ENTITY version   "2015.12.29">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
@@ -17,6 +17,8 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;">
 
 <CHANGES>
+###2015.12.29
+- create packages directory on install
 ###2015.12.15a
 - remove command output
 ###2015.12.15
@@ -116,6 +118,10 @@ else
   upgradepkg --install-new &plgpath;/&plgname;.txz
 fi
 
+if [ ! -d &plgpath;/packages ]; then
+	mkdir &plgpath;/packages
+fi
+
 # Update file permissions of scripts
 chmod +0755 &emhttp;/scripts/*
 
diff --git a/plugins/NerdPack.xml b/plugins/NerdPack.xml
index 93833934..88444edd 100644
--- a/plugins/NerdPack.xml
+++ b/plugins/NerdPack.xml
@@ -11,8 +11,10 @@ This plugin allows installation of extra packages, mostly CLI, for advanced user
 </Description>
 <Support>http://lime-technology.com/forum/index.php?topic=37541.0</Support>
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/NerdPack.png</Icon>
-<Date>2015-12-15a</Date>
+<Date>2015-12-29</Date>
 <Changes>
+###2015.12.29
+- create packages directory on install
 ###2015.12.15a
 - remove command output
 ###2015.12.15
diff --git a/plugins/ipmitool-plugin.plg b/plugins/ipmitool-plugin.plg
index f7ade01a..5615259f 100755
--- a/plugins/ipmitool-plugin.plg
+++ b/plugins/ipmitool-plugin.plg
@@ -3,7 +3,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "ipmitool-plugin">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2015.12.20">
+<!ENTITY version   "2015.12.29">
 <!ENTITY launch    "Tools/IPMItool">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
@@ -18,6 +18,8 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;">
 
 <CHANGES>
+###2015.12.29
+- remove old plugin directory on install
 ###2015.12.20
 - fixed "Waiting for events" triggering notification on system start
 - reorganize events page
@@ -85,7 +87,7 @@ if [[ ${version:0:3} == 6.0 ]]; then
 fi
 
 #remove old plugin name directory
-if [ ! -d /usr/local/emhttp/plugins/ipmitool ]; then
+if [ -d /usr/local/emhttp/plugins/ipmitool ]; then
 	rm -rf  /usr/local/emhttp/plugins/ipmitool
 fi
 
diff --git a/plugins/ipmitool-plugin.xml b/plugins/ipmitool-plugin.xml
index 590d6232..d2f90e0f 100644
--- a/plugins/ipmitool-plugin.xml
+++ b/plugins/ipmitool-plugin.xml
@@ -11,8 +11,10 @@ The ipmitool plugin allows you to view your system sensors and events using your
 </Description>
 <Support>http://lime-technology.com/forum/index.php?topic=39787.0</Support>
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/ipmitool-plugin.png</Icon>
-<Date>2015-12-20</Date>
+<Date>2015-12-29</Date>
 <Changes>
+###2015.12.29
+- remove old plugin directory on install
 ###2015.12.20
 - fixed "Waiting for events" triggering notification on system start
 - reorganize events page
diff --git a/plugins/shellinabox-plugin.plg b/plugins/shellinabox-plugin.plg
index 7c00705b..e257b1be 100755
--- a/plugins/shellinabox-plugin.plg
+++ b/plugins/shellinabox-plugin.plg
@@ -3,7 +3,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "shellinabox-plugin">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2015.12.21">
+<!ENTITY version   "2015.12.29">
 <!ENTITY launch    "Settings/Shellinabox">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
@@ -21,6 +21,8 @@ This Plugin installs and controls shellinabox for unRaid 6.1  All dependencies a
 -->
 
 <CHANGES>
+###2015.12.29
+- remove old plugin directory on install
 ###2015.12.21
 - move repo to unRAID-plugins
 - change plugin name to shellinabox-plugin
@@ -86,7 +88,7 @@ if [[ ${version:0:3} == 6.0 ]]; then
 fi
 
 #remove old plugin name directory
-if [ ! -d /usr/local/emhttp/plugins/shellinabox ]; then
+if [ -d /usr/local/emhttp/plugins/shellinabox ]; then
 	rm -rf  /usr/local/emhttp/plugins/shellinabox
 fi
 
diff --git a/plugins/shellinabox-plugin.xml b/plugins/shellinabox-plugin.xml
index 48caf687..fbb6db3b 100644
--- a/plugins/shellinabox-plugin.xml
+++ b/plugins/shellinabox-plugin.xml
@@ -11,8 +11,10 @@ Shell In A Box implements a web server that can export arbitrary command line to
 </Description>
 <Support>http://lime-technology.com/forum/index.php?topic=42683.0</Support>
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/shellinabox-plugin.png</Icon>
-<Date>2015-12-21</Date>
+<Date>2015-12-29</Date>
 <Changes>
+###2015.12.29
+- remove old plugin directory on install
 ###2015.12.21
 - move repo to unRAID-plugins
 - change plugin name to shellinabox-plugin
diff --git a/source/NerdPack/install/slack-desc~ b/source/NerdPack/install/slack-desc~
deleted file mode 100644
index ec323c11..00000000
--- a/source/NerdPack/install/slack-desc~
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-NerdPack: Nerd Tools unRAID Plugin
-NerdPack:
-NerdPack: unRAID plugin wrapper for extra packages, mostly CLI, for advanced
-NerdPack: users.  Use at your own risk. Not officially supported by LimeTech.
-NerdPack: 
-NerdPack: Supports: apr, apt-util, bwm-ng, cpio, git, iftop, inotify, iotop,
-NerdPack: iperf, kbd, lftp, lshw, neon, p7zip, perl, python, readline, screen,
-NerdPack: sshfs-fuse, strace, subversion, unrar, utempter, vim
-NerdPack: 
-NerdPack: plugin:   https://github.com/dmacias72/unRAID-plugins
-NerdPack: packages: https://github.com/eschultz/unraid6-nerdpack
diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageRemove.php b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageRemove.php
deleted file mode 100644
index cbb49f8f..00000000
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageRemove.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$filename = "/boot/config/plugins/NerdPack/packages/".$_POST["pkg"];
-if (is_file($filename));
-	unlink($filename);
-?>
diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageUpdate.php b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageUpdate.php
deleted file mode 100644
index 220de3db..00000000
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageUpdate.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$pkg_path="/boot/config/plugins/NerdPack/packages/";
-$pkg_git = "https://raw.githubusercontent.com/eschultz/unraid6-nerdpack/master/packages/";
-
-$pkg_name = $_POST["pkgnew"];
-$pkg_new = $pkg_path.$pkg_name;
-
-$pkg_config = "/boot/config/plugins/NerdPack/NerdPack.cfg";
-$pkg_cfg = parse_ini_file($pkg_config); // get package configs
-$pkg_pref = $pkg_cfg[$_POST["pkgname"]]; // get package preference
-$pkg_old = $pkg_path.$_POST["pkgold"];
-
-$pkg_msg = "$pkg_name package download failed.";
-if (file_put_contents($pkg_new, fopen($pkg_git.$pkg_name, 'r')));{
-	$pkg_size = filesize($pkg_new);
-	$pkg_handle = fopen($pkg_new, "rb");
-	$pkg_contents = fread($pkg_handle, $pkg_size);
-	fclose($pkg_handle);
-	//shell_exec("cd $pkg_path && wget -q $pkg_new");
-	$pkg_str = "blob ".$pkg_size."\0".$pkg_contents;
-	$pkg_sha = sha1($pkg_str);
-	if($pkg_sha == $_POST["pkgsha"]) {
-		$pkg_msg = "$pkg_name package downloaded.";
-		if (is_file($pkg_old))
-			unlink($pkg_old);
-		if($pkg_pref == "yes") {
-			$pkg_cmd = "upgradepkg --install-new ";
-			$pkg_cmd = $pkg_cmd.$pkg_new." | logger -tnerdpack";
-			shell_exec($pkg_cmd);
-			$pkg_msg = "$pkg_name package updated.";
-		}
-	}else {
-		if (is_file($pkg_new))
-			unlink($pkg_new);
-	}
-}
-echo json_encode($pkg_msg);
-?>