diff --git a/archive/NerdTools-2022.09.29k-x86_64-1.md5 b/archive/NerdTools-2022.09.29k-x86_64-1.md5 new file mode 100644 index 0000000..2ad3817 --- /dev/null +++ b/archive/NerdTools-2022.09.29k-x86_64-1.md5 @@ -0,0 +1 @@ +bab8d966063b49e791d898d7fb2b5559 NerdTools-2022.09.29k-x86_64-1.txz diff --git a/archive/NerdTools-2022.09.29k-x86_64-1.txz b/archive/NerdTools-2022.09.29k-x86_64-1.txz new file mode 100644 index 0000000..7682d77 Binary files /dev/null and b/archive/NerdTools-2022.09.29k-x86_64-1.txz differ diff --git a/plugin/NerdTools.plg b/plugin/NerdTools.plg index cfa5e21..a450906 100644 --- a/plugin/NerdTools.plg +++ b/plugin/NerdTools.plg @@ -3,7 +3,7 @@ - + diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php index c6aa827..8228624 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php @@ -2,18 +2,17 @@ $plg_path = '/boot/config/plugins/NerdTools/'; // plugin path $os_version = strtok(parse_ini_file('/etc/unraid-version')['version'], '.') . '.' . strtok('.'); -$pkg_path = $plg_path; // package path $pkg_path = $plg_path; // package path if (!is_dir($pkg_path)) mkdir($pkg_path); - + $pkg_extra_path = "/boot/extra/"; // package path if (!is_dir($pkg_extra_path)) mkdir($pkg_extra_path); - + $pkg_desc = 'https://raw.githubusercontent.com/jsavargas/unRAID-NerdTools/2022.09.28/contents/packages-desc'; $pkg_repo = "https://raw.githubusercontent.com/jsavargas/unRAID-NerdTools/2022.09.28/contents/packages.$os_version.json"; - + $desc_file = $pkg_path.'packages-desc'; $repo_file = $pkg_path.'packages.json'; @@ -23,7 +22,7 @@ $config_file = $plg_path.'NerdTools.cfg'; $pkg_cfg = file_exists($config_file) ? parse_ini_file($config_file) : []; // get array of downloaded packages -$pkgs_downloaded = is_dir($pkg_path) ? array_diff(scandir($pkg_path, 1), ['.', '..','packages.json','packages-desc']) : []; +$pkgs_downloaded = is_dir($pkg_extra_path) ? array_diff(scandir($pkg_extra_path, 1), ['.', '..','packages.json','packages-desc']) : []; // get array of all installed packages $pkgs_installed = array_diff(scandir("/var/log/packages", 1), ['.', '..']); diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js index c075ac2..7c88c65 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js @@ -158,12 +158,7 @@ function Apply() { function checkDepends() { try { - if ($('#screen')[0].checked) { - $('#utempter').switchButton({checked: true}); - $('#utempter', '.pkgvalue').val('yes'); - $('#ncurses-terminfo').switchButton({checked: true}); - $('#ncurses-terminfo', '.pkgvalue').val('yes'); - } + if ($('#tmux')[0].checked) { $('#ncurses-terminfo').switchButton({checked: true}); $('#ncurses-terminfo', '.pkgvalue').val('yes'); @@ -192,10 +187,10 @@ function checkDepends() { $('#utf8proc').switchButton({checked: true}); $('#utf8proc', '.pkgvalue').val('yes'); } + } catch (error) { console.error(error); // expected output: ReferenceError: nonExistentFunction is not defined // Note - error messages will vary depending on browser } - } diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/scripts/packagemanager b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/scripts/packagemanager old mode 100644 new mode 100755