Flummi/Unraid-SlackPack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix false positive, update pattern

Browse Source
This commit is contained in:
dmacias72 2016-10-08 14:45:12 -06:00
parent 74bbb8cc1c
commit 0b5ac0e685
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/NerdPack/usr/local/emhttp/plugins/NerdPack/scripts/packagemanager
View File

@ -68,7 +68,7 @@ logger('Processing Packages...');
foreach ($pkg_cfg as $pkg_name => $pkg_pref) { // get preferences for each package foreach ($pkg_cfg as $pkg_name => $pkg_pref) { // get preferences for each package
$pkg_cmd = ''; $pkg_cmd = '';
$pkg_name = str_replace('_', '.', $pkg_name); // replace "_" with "." in package names $pkg_name = str_replace('_', '.', $pkg_name); // replace "_" with "." in package names
$pkg_pattern = '/^'.$pkg_name.'.*/'; // search pattern for packages $pkg_pattern = '/^'.$pkg_name.'.-*/'; // search pattern for packages
$pkg_install_status = preg_grep($pkg_pattern, $pkgs_installed); // check install status $pkg_install_status = preg_grep($pkg_pattern, $pkgs_installed); // check install status
$pkg_download_status = preg_grep($pkg_pattern, $pkgs_downloaded); // check package download status $pkg_download_status = preg_grep($pkg_pattern, $pkgs_downloaded); // check package download status
$pkg_online_status = preg_grep($pkg_pattern, $pkgs_github_array); $pkg_online_status = preg_grep($pkg_pattern, $pkgs_github_array);
@ -93,7 +93,8 @@ foreach ($pkg_cfg as $pkg_name => $pkg_pref) { // get preferences for each packa
logger(substr($plg_msg, 0, -2)); logger(substr($plg_msg, 0, -2));
} }
if ($pkg_pref == 'yes') { // if package is selected to be installed // if package is selected to be installed
if ($pkg_pref == 'yes') {
// if executing from the wegui check status and download if necessary // if executing from the wegui check status and download if necessary
if ($argd) { if ($argd) {
if (!$pkg_download_status) { //if package is not downloaded if (!$pkg_download_status) { //if package is not downloaded