Updated paths

This commit is contained in:
damnoodle 2022-08-23 20:26:24 -05:00
parent 2276ff27dc
commit 4bbef7f489
51 changed files with 40 additions and 55 deletions

View File

@ -1 +0,0 @@
341ea33a9a31b1cefc92ad1aeb1e3357 NerdPack-2017.06.17-x86_64-1.txz

View File

@ -1 +0,0 @@
b0706b86efee8ae12784bdd8ab73fa38 NerdPack-2017.07.08-x86_64-1.txz

View File

@ -1 +0,0 @@
baf29e419af041071e97bc6beabc8f77 NerdPack-2017.09.24-x86_64-1.txz

View File

@ -1 +0,0 @@
3664d992d445b141b0bfcb674d7d65da NerdPack-2017.10.01-x86_64-1.txz

View File

@ -1 +0,0 @@
65974e41fd5686a83c27f37d613b831e NerdPack-2017.10.01a-x86_64-1.txz

View File

@ -1 +0,0 @@
2c9555650b5b1abba110f300449c5ca2 NerdPack-2017.10.01b-x86_64-1.txz

View File

@ -1 +0,0 @@
565928cce771ffa17d483131fb49f1b0 NerdPack-2017.10.03-x86_64-1.txz

View File

@ -1 +0,0 @@
b0a19299e612591dc5fec1cb06969647 NerdPack-2017.10.03a-x86_64-1.txz

View File

@ -1 +0,0 @@
33a7b15f9368a5b83a3f901b5396f67c NerdPack-2018.02.17-x86_64-1.txz

View File

@ -1 +0,0 @@
1f8d1428d6f35933342f44e0c766e4fd NerdPack-2018.09.20-x86_64-1.txz

View File

@ -1 +0,0 @@
63b4eff5550a14934fbb7e05cbf1ffbe NerdPack-2019.01.24-x86_64-1.txz

View File

@ -1 +0,0 @@
f789253f702b1e7ab3b679369e2371ae NerdPack-2019.01.25-x86_64-1.txz

View File

@ -1 +0,0 @@
9d759cf2868047ab5bd77fbca2f234cb NerdPack-2019.12.31-x86_64-1.txz

View File

@ -1 +0,0 @@
eab0b690e89d2f34e74656434f07405d NerdPack-2021.01.08-x86_64-1.txz

View File

@ -1 +0,0 @@
e48b0512fb135bce04f45cee3d4d99c5 NerdPack-2021.08.11-x86_64-1.txz

View File

@ -234,7 +234,7 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
&plgPATH;/&plgNAME;.md5 &plgPATH;/&plgNAME;.md5
exit 1 exit 1
else else
count=`ls -1 /boot/config/plugins/NerdPack/packages/*.txz 2>/dev/null | wc -l` count=`ls -1 /boot/config/plugins/SlackPack/packages/*.txz 2>/dev/null | wc -l`
if [ $count != 0 ]; then if [ $count != 0 ]; then
if [ ! -d &plgPATH;/packages/6.1 ]; then if [ ! -d &plgPATH;/packages/6.1 ]; then
mkdir -p &plgPATH;/packages/6.1 mkdir -p &plgPATH;/packages/6.1
@ -250,7 +250,7 @@ else
#check for previous version #check for previous version
OLD=$(echo | awk "{print ${VER} - 0.1}") OLD=$(echo | awk "{print ${VER} - 0.1}")
if [ -d &plgPATH;/packages/${OLD} ]; then if [ -d &plgPATH;/packages/${OLD} ]; then
count2=`ls -1 /boot/config/plugins/NerdPack/packages/${OLD}/*.txz 2>/dev/null | wc -l` count2=`ls -1 /boot/config/plugins/SlackPack/packages/${OLD}/*.txz 2>/dev/null | wc -l`
if [ $count2 != 0 ]; then if [ $count2 != 0 ]; then
echo "Copying package files..." echo "Copying package files..."
cp &plgPATH;/packages/${OLD}/* &plgPATH;/packages/${VER}/ cp &plgPATH;/packages/${OLD}/* &plgPATH;/packages/${VER}/
@ -259,7 +259,7 @@ else
#check for two versions ago #check for two versions ago
OLD2=$(echo | awk "{print ${VER} - 0.2}") OLD2=$(echo | awk "{print ${VER} - 0.2}")
if [ -d &plgPATH;/packages/${OLD2} ]; then if [ -d &plgPATH;/packages/${OLD2} ]; then
count3=`ls -1 /boot/config/plugins/NerdPack/packages/${OLD2}/*.txz 2>/dev/null | wc -l` count3=`ls -1 /boot/config/plugins/SlackPack/packages/${OLD2}/*.txz 2>/dev/null | wc -l`
if [ $count3 != 0 ]; then if [ $count3 != 0 ]; then
echo "Copying package files..." echo "Copying package files..."
cp &plgPATH;/packages/${OLD2}/* &plgPATH;/packages/${VER}/ cp &plgPATH;/packages/${OLD2}/* &plgPATH;/packages/${VER}/

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -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: Slackware Packages Unraid Plugin
NerdPack:
NerdPack: Unraid plugin wrapper for slackware packages, 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: https://github.com/damnoodle/Unraid-SlackPack
NerdPack:

View File

@ -23,13 +23,13 @@ Optional dependencies:
## kubedzero build & execute notes ## kubedzero build & execute notes
- Since the SlackBuild file only calls for the `slack-desc`, `borgbackup-1.1.x.tar.gz`, and the `unicode_docs.patch` file, I've removed the `borgbackup.info` file since it was out of date anyway. - Since the SlackBuild file only calls for the `slack-desc`, `borgbackup-1.1.x.tar.gz`, and the `unicode_docs.patch` file, I've removed the `borgbackup.info` file since it was out of date anyway.
- https://github.com/dmacias72/unRAID-NerdPack/issues/34 we found in Borgbackup-1.1.14 that due to Python 3.9 being supported, llfuse-1.3.8 was supported. It needs to be installed for Borg mounting to function. I do not think it is needed for package compilation/creation, though if needed it can be grabbed from elsewhere in this repo. - https://github.com/dmacias72/Unraid-SlackPack/issues/34 we found in Borgbackup-1.1.14 that due to Python 3.9 being supported, llfuse-1.3.8 was supported. It needs to be installed for Borg mounting to function. I do not think it is needed for package compilation/creation, though if needed it can be grabbed from elsewhere in this repo.
- https://github.com/borgbackup/borg/issues/5591 we found in BorgBackup-1.1.15 that xxHash-0.8.0 is now preferred as the hash library instead of a built-in hash library. That means it depends on files not installed as part of the BorgBackup package installation. During compilation of BorgBackup, it checks a Boolean https://github.com/borgbackup/borg/blob/1.1.15/setup.py#L26 and also looks for installed copies of xxHash (and its library libxxhash) to determine if this "better" library should be used or if the bundled hash library should be used. If - https://github.com/borgbackup/borg/issues/5591 we found in BorgBackup-1.1.15 that xxHash-0.8.0 is now preferred as the hash library instead of a built-in hash library. That means it depends on files not installed as part of the BorgBackup package installation. During compilation of BorgBackup, it checks a Boolean https://github.com/borgbackup/borg/blob/1.1.15/setup.py#L26 and also looks for installed copies of xxHash (and its library libxxhash) to determine if this "better" library should be used or if the bundled hash library should be used. If
- This same "check the system if this package is installed, otherwise use the bundled version" applies to `lz4`, `libstd`, and `libb2` (blake2). It should be noted that if BorgBackup is compiled while the system library is used but the compiled package is then moved to a system such as Unraid without that installed package, an error such as `libxxhash.so.0: cannot open shared object file: No such file or directory` may be seen. This particular error was seen when running `borg --version` on a system without the `xxhash` library installed. I downloaded the library from a Slackware source mirror: http://slackware.cs.utah.edu/pub/slackware/slackware64-current/slackware64/l/ or https://mirrors.slackware.com/slackware/slackware64-current/slackware64/l/ - This same "check the system if this package is installed, otherwise use the bundled version" applies to `lz4`, `libstd`, and `libb2` (blake2). It should be noted that if BorgBackup is compiled while the system library is used but the compiled package is then moved to a system such as Unraid without that installed package, an error such as `libxxhash.so.0: cannot open shared object file: No such file or directory` may be seen. This particular error was seen when running `borg --version` on a system without the `xxhash` library installed. I downloaded the library from a Slackware source mirror: http://slackware.cs.utah.edu/pub/slackware/slackware64-current/slackware64/l/ or https://mirrors.slackware.com/slackware/slackware64-current/slackware64/l/
- I updated the SlackBuild to adjust these flags in the `setup.py` file to False (default is True) to force usage of the bundled libraries for maximum portability between Slackware and the super-cut-down Unraid flavor of Slackware. This way, Unraid users of this package need not install extra packages such as `xxHash` to get BorgBackup working. - I updated the SlackBuild to adjust these flags in the `setup.py` file to False (default is True) to force usage of the bundled libraries for maximum portability between Slackware and the super-cut-down Unraid flavor of Slackware. This way, Unraid users of this package need not install extra packages such as `xxHash` to get BorgBackup working.
- There were some other files in this SlackBuild directory: - There were some other files in this SlackBuild directory:
- `acl-2.2.53-x86_64-1.txz` - Retrieved from the Slackware A package group. I had this installed when compiling, but did not have this installed on Unraid - `acl-2.2.53-x86_64-1.txz` - Retrieved from the Slackware A package group. I had this installed when compiling, but did not have this installed on Unraid
- `libffi-3.3-x86_64-1.txz` - Retrieved from the Slackware L package group. I had this installed when compiling, and also have it installed in Unraid for an unrelated project `openVMTools_compiled`. I believe it is installed via Nerd Pack on Unraid. - `libffi-3.3-x86_64-1.txz` - Retrieved from the Slackware L package group. I had this installed when compiling, and also have it installed in Unraid for an unrelated project `openVMTools_compiled`. I believe it is installed via Slack Pack on Unraid.
- `lz4-1.9.3-x86_64-1.txz` - Retrieved from the Slackware L package group. I had this installed when compiling, but did not have this installed on Unraid - `lz4-1.9.3-x86_64-1.txz` - Retrieved from the Slackware L package group. I had this installed when compiling, but did not have this installed on Unraid
- `msgpack-python-0.6.2-x86_64-2cf.txz` - Not sure what this is or where this is from. I did not have this installed when compiling, nor did I have this on Unraid. I checked in `pip3 --list` as well and confirmed Python3 is not aware of it. - `msgpack-python-0.6.2-x86_64-2cf.txz` - Not sure what this is or where this is from. I did not have this installed when compiling, nor did I have this on Unraid. I checked in `pip3 --list` as well and confirmed Python3 is not aware of it.
- `cryptography-2.8-x86_64-1cf.txz` - Not sure what this is or where this is from. Not installed during compilation, nor is it installed on Unraid - `cryptography-2.8-x86_64-1cf.txz` - Not sure what this is or where this is from. Not installed during compilation, nor is it installed on Unraid

View File

@ -0,0 +1,19 @@
# 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------------------------------------------------------|
SlackPack: Slackware Packages Unraid Plugin
SlackPack:
SlackPack: Unraid plugin wrapper for slackware packages, for advanced
SlackPack: users. Use at your own risk. Not officially supported by LimeTech.
SlackPack:
SlackPack: Supports: apr, apt-util, bwm-ng, cpio, git, iftop, inotify, iotop,
SlackPack: iperf, kbd, lftp, lshw, neon, p7zip, perl, python, readline, screen,
SlackPack: sshfs-fuse, strace, subversion, unrar, utempter, vim
SlackPack:
SlackPack: https://github.com/damnoodle/Unraid-SlackPack
SlackPack:

View File

@ -3,10 +3,10 @@ Menu="UserPreferences"
Title="Slack Pack" Title="Slack Pack"
Tag="dropbox" Tag="dropbox"
--- ---
<link type="text/css" rel="stylesheet" href="<?=autov('/plugins/NerdPack/css/tablesorter.css');?>"> <link type="text/css" rel="stylesheet" href="<?=autov('/plugins/SlackPack/css/tablesorter.css');?>">
<link type="text/css" rel="stylesheet" href="<?=autov('/plugins/NerdPack/css/tablesorter-'.(($display['theme'] == 'white' || $display['theme'] == 'azure') ? 'white' : 'black').'.css');?>"> <link type="text/css" rel="stylesheet" href="<?=autov('/plugins/SlackPack/css/tablesorter-'.(($display['theme'] == 'white' || $display['theme'] == 'azure') ? 'white' : 'black').'.css');?>">
<link type="text/css" rel="stylesheet" href="<?=autov('/webGui/styles/jquery.switchbutton.css');?>"> <link type="text/css" rel="stylesheet" href="<?=autov('/webGui/styles/jquery.switchbutton.css');?>">
<link type="text/css" rel="stylesheet" href="<?=autov('/plugins/NerdPack/css/SlackPack.css');?>"> <link type="text/css" rel="stylesheet" href="<?=autov('/plugins/SlackPack/css/SlackPack.css');?>">
<style> <style>
table.tablesorter tbody tr:nth-child(odd) { table.tablesorter tbody tr:nth-child(odd) {
background-color: #<?=($display['theme'] == 'white' || $display['theme'] == 'azure') ? 'F0F0F0' : '212421';?>; background-color: #<?=($display['theme'] == 'white' || $display['theme'] == 'azure') ? 'F0F0F0' : '212421';?>;
@ -17,7 +17,7 @@ table.tablesorter tbody tr:nth-child(even) {
</style> </style>
<form markdown="1" id="package_form" name="package_settings" method="POST" action="/update.php" target="progressFrame"> <form markdown="1" id="package_form" name="package_settings" method="POST" action="/update.php" target="progressFrame">
<input type="hidden" id="include" name="#include" value="/plugins/NerdPack/include/ClearConfig.php"/> <input type="hidden" id="include" name="#include" value="/plugins/SlackPack/include/ClearConfig.php"/>
<div class="wrapper"> <div class="wrapper">
<table class="tablesorter hover-highlight" id="tblPackages"> <table class="tablesorter hover-highlight" id="tblPackages">
@ -38,10 +38,10 @@ table.tablesorter tbody tr:nth-child(even) {
</div> </div>
<input onclick="packageQuery(1)" value="Check for Updates" type="button"><input class="reset" type="button" title="reset filters" value="Reset Filters"> <input onclick="packageQuery(1)" value="Check for Updates" type="button"><input class="reset" type="button" title="reset filters" value="Reset Filters">
: <input id="btnApply" type="button" value="Apply"><input type="button" value="Done" onClick="done()"> : <input id="btnApply" type="button" value="Apply"><input type="button" value="Done" onClick="done()">
<input type="hidden" name="#file" value="NerdPack/NerdPack.cfg"> <input type="hidden" name="#file" value="SlackPack/SlackPack.cfg">
</form> </form>
<script src="<?=autov('/plugins/NerdPack/js/jquery.tablesorter.combined.min.js');?>"></script> <script src="<?=autov('/plugins/SlackPack/js/jquery.tablesorter.combined.min.js');?>"></script>
<script src="<?=autov('/plugins/NerdPack/js/parser-metric.min.js');?>"></script> <script src="<?=autov('/plugins/SlackPack/js/parser-metric.min.js');?>"></script>
<script type="text/javascript" src="<?=autov('/webGui/javascript/jquery.switchbutton.js');?>"></script> <script type="text/javascript" src="<?=autov('/webGui/javascript/jquery.switchbutton.js');?>"></script>
<script type="text/javascript" src="<?=autov('/plugins/NerdPack/js/jquery.NerdPack.js');?>"></script> <script type="text/javascript" src="<?=autov('/plugins/SlackPack/js/jquery.SlackPack.js');?>"></script>

View File

@ -1,6 +1,6 @@
<? <?
require_once '/usr/local/emhttp/plugins/NerdPack/include/SlackPackHelpers.php'; require_once '/usr/local/emhttp/plugins/SlackPack/include/SlackPackHelpers.php';
require_once '/usr/local/emhttp/plugins/NerdPack/include/DownloadHelpers.php'; require_once '/usr/local/emhttp/plugins/SlackPack/include/DownloadHelpers.php';
// Only download repo update if the current one is 1 hour old or more // Only download repo update if the current one is 1 hour old or more
if (!file_exists($repo_file) || !empty($_GET['force']) || (filemtime($repo_file) < (time() - 3600))) { if (!file_exists($repo_file) || !empty($_GET['force']) || (filemtime($repo_file) < (time() - 3600))) {

View File

@ -10,7 +10,7 @@ $pkg_repo = "https://api.github.com/repos/damnoodle/Unraid-SlackPack/contents/pa
$desc_file = $pkg_path.'packages-desc'; $desc_file = $pkg_path.'packages-desc';
$repo_file = $pkg_path.'packages.json'; $repo_file = $pkg_path.'packages.json';
$config_file = $plg_path.'NerdPack.cfg'; $config_file = $plg_path.'SlackPack.cfg';
// get package configs // get package configs
$pkg_cfg = file_exists($config_file) ? parse_ini_file($config_file) : []; $pkg_cfg = file_exists($config_file) ? parse_ini_file($config_file) : [];

View File

@ -53,7 +53,7 @@ $(function(){
//list all available packages in a table //list all available packages in a table
function packageQuery(force) { function packageQuery(force) {
$('#tblPackages tbody').html("<tr><td colspan='6'><br><i class='fa fa-spinner fa-spin icon'></i><em>Please wait, retrieving plugin information ...</em></td><tr>"); $('#tblPackages tbody').html("<tr><td colspan='6'><br><i class='fa fa-spinner fa-spin icon'></i><em>Please wait, retrieving plugin information ...</em></td><tr>");
$.getJSON('/plugins/NerdPack/include/PackageQuery.php', {force: force}, function(data) { $.getJSON('/plugins/SlackPack/include/PackageQuery.php', {force: force}, function(data) {
$('#tblPackages tbody').empty(); $('#tblPackages tbody').empty();
var Ready; var Ready;
var Count = 0; var Count = 0;
@ -150,7 +150,7 @@ function Apply() {
checkDepends(); checkDepends();
var Arg2 = (typeof $.cookie('slackpack_packages_uninstall') === 'undefined') ? '' : '&arg2='+$.cookie('slackpack_packages_uninstall'); var Arg2 = (typeof $.cookie('slackpack_packages_uninstall') === 'undefined') ? '' : '&arg2='+$.cookie('slackpack_packages_uninstall');
$.post('/update.php', $('#package_form').serializeArray(), function() { $.post('/update.php', $('#package_form').serializeArray(), function() {
openBox('/plugins/NerdPack/scripts/packagemanager&arg1=--download'+ Arg2, openBox('/plugins/SlackPack/scripts/packagemanager&arg1=--download'+ Arg2,
'Package Manager', 600, 900, true); 'Package Manager', 600, 900, true);
} }
); );

View File

@ -48,8 +48,8 @@ $argu = (array_key_exists("u", $args) || array_key_exists("uninstall", $args));
$argv = (array_key_exists("v", $args) || array_key_exists("verbose", $args)); $argv = (array_key_exists("v", $args) || array_key_exists("verbose", $args));
$debug = array_key_exists("debug", $args); $debug = array_key_exists("debug", $args);
require_once '/usr/local/emhttp/plugins/NerdPack/include/SlackPackHelpers.php'; require_once '/usr/local/emhttp/plugins/SlackPack/include/SlackPackHelpers.php';
require_once '/usr/local/emhttp/plugins/NerdPack/include/DownloadHelpers.php'; require_once '/usr/local/emhttp/plugins/SlackPack/include/DownloadHelpers.php';
/* debug */ /* debug */
function debug($m){ function debug($m){