diff --git a/plugins/NerdPack.plg b/plugins/NerdPack.plg index a1c84c31..628f9f15 100644 --- a/plugins/NerdPack.plg +++ b/plugins/NerdPack.plg @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ -###2016.01.10b +###2016.01.10a-c - fix name of package description file ###2016.01.10 - added dynamic package description tootips diff --git a/plugins/NerdPack.xml b/plugins/NerdPack.xml index 9eefefd0..43887146 100644 --- a/plugins/NerdPack.xml +++ b/plugins/NerdPack.xml @@ -13,7 +13,7 @@ This plugin allows installation of extra packages, mostly CLI, for advanced user https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/NerdPack.png 2016-01-10 -###2016.01.10a +###2016.01.10a-c - fix name of package description file ###2016.01.10 - added dynamic package description tootips diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php index f5ef5ad6..f5b0655c 100644 --- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php +++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php @@ -2,7 +2,7 @@ require_once("/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php"); $plg_path ="/boot/config/plugins/NerdPack";// plugin path -$pkg_path = "$plg_path/packages"; // package path +$pkg_path = "$plg_path/packages/"; // package path $config_file = "$plg_path/NerdPack.cfg";// config file $pkg_cfg = (is_file($config_file)) ? parse_ini_file($config_file) : array(); // get package configs @@ -11,10 +11,10 @@ $pkgs_downloaded = array_diff( scandir($pkg_path, 1), array(".", "..") ); // get $pkgs_installed = array_diff( scandir("/var/log/packages", 1), array(".", "..") ); // get array of all installed packages -$pkgs_desc_file = file_get_contents("$pkg_path/packages-desc");// get package descriptions +$pkgs_desc_file = file_get_contents($pkg_path."packages-desc");// get package descriptions $pkgs_desc_array = json_decode($pkgs_desc_file, true); -$pkgs_github_file = file_get_contents("$pkg_path/packages.json");// get packages +$pkgs_github_file = file_get_contents($pkg_path."packages.json");// get packages $pkgs_github_array = json_decode($pkgs_github_file, true); $pkgs_array = array(); diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/scripts/packagemanager b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/scripts/packagemanager index fae08642..fce60eb9 100755 --- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/scripts/packagemanager +++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/scripts/packagemanager @@ -55,9 +55,9 @@ function logger($output, $quiet) { usleep(100000); } -$config_file = "/boot/config/plugins/NerdPack/NerdPack.cfg"; - -$pkg_path ="/boot/config/plugins/NerdPack/packages/"; +$plg_path ="/boot/config/plugins/NerdPack";// plugin path +$pkg_path = "$plg_path/packages/"; // package path +$config_file = "$plg_path/NerdPack.cfg";// config file $pkg_cfg = (is_file($config_file)) ? parse_ini_file($config_file) : array(); // get package configs @@ -65,7 +65,7 @@ $pkgs_downloaded = array_diff( scandir($pkg_path, 1), array(".", "..") ); // get $pkgs_installed = array_diff( scandir("/var/log/packages", 1), array(".", "..") ); -$pkgs_json = "/boot/config/plugins/NerdPack/packages.json"; +$pkgs_json = $pkg_path."packages.json"; $pkgs_file = (is_file($pkgs_json)) ? file_get_contents($pkgs_json) : array(); $pkgs_github = json_decode($pkgs_file, true);