Skip to content

Commit

Permalink
[merge] from unstable into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
OneCDOnly committed Apr 27, 2024
2 parents ec23433 + 70d8391 commit 8554f3d
Show file tree
Hide file tree
Showing 17 changed files with 248 additions and 175 deletions.
Binary file modified QPKGs/sherpa/build/sherpa.qpkg
Binary file not shown.
Binary file added QPKGs/sherpa/build/sherpa_240428.qpkg
Binary file not shown.
1 change: 1 addition & 0 deletions QPKGs/sherpa/build/sherpa_240428.qpkg.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8bac70224e620d0a267b681fbdd69c4f build/sherpa_240428.qpkg
2 changes: 1 addition & 1 deletion QPKGs/sherpa/qpkg.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
QPKG_NAME="sherpa"
QPKG_VER="240427"
QPKG_VER="240428"
QPKG_AUTHOR="OneCD"
QPKG_RC_NUM="500"
QPKG_SERVICE_PROGRAM="sherpa-service.sh"
Expand Down
2 changes: 1 addition & 1 deletion QPKGs/sherpa/shared/sherpa-loader.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
readonly USER_ARGS_RAW=$*
Init()
{
export LOADER_SCRIPT_VER='240427'
export LOADER_SCRIPT_VER='240428'
export LOADER_SCRIPT_PPID=$PPID
readonly QPKG_NAME=sherpa
readonly CHARS_REGULAR_PROMPT='$ '
Expand Down
2 changes: 1 addition & 1 deletion docs/QNAP-forum-announcement.bbcode
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The world's first multi-action CLI package-manager!

Package management via [b]sherpa[/b] provides features like easy application backup, upgrading, service and daemon management, multi-threaded operation, self-checking and repair, and all operations may be automated via cron.

[list][b][color=#A371F7]Important:[/color][/b] this is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. [color=#FF0000][b]Do not[/b][/color] use [b]sherpa[/b] in production environments, unless you're comfortable with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
[list][b][color=#A371F7]Important:[/color][/b] this is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. [color=#F85149][b]Do not[/b][/color] use [b]sherpa[/b] in production environments, unless you're comfortable with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.

That said: the majority of development is now complete, and I'm currently working-on increasing stability during auto-package upgrades. So, [b]sherpa[/b] will work beautifully on a fresh (or new) system, but can experience issues when individual application updates are released.
[/list]
Expand Down
15 changes: 4 additions & 11 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
![icon](images/sherpa.readme.png)

sherpa: a mini-package-manager for QNAP NAS
============================================

[![Latest Release](https://img.shields.io/github/v/release/OneCDOnly/sherpa?logo=github&label=latest%20release)](https://github.com/OneCDOnly/sherpa/releases/latest) ![Static Badge](https://img.shields.io/badge/release_status-beta-orange?logo=github) ![Project Launch](https://img.shields.io/date/1494050732?logo=github&label=project%20launch)


The world's first multi-action CLI package-manager!

Package management via **sherpa** provides features like easy application backup, upgrading, service and daemon management, multi-threaded operation, self-checking and repair, and all operations may be automated via cron.
Expand All @@ -16,25 +13,21 @@ Package management via **sherpa** provides features like easy application backup
> That said: the majority of development is now complete, and I'm currently working-on increasing stability during auto-package upgrades. So, <b>sherpa</b> will work beautifully on a fresh (or new) system, but can experience issues when individual application updates are released.
<b>[Click here for installable packages](https://github.com/OneCDOnly/sherpa/wiki/Packages)</b>


## Installation

- [SSH](https://www.qnap.com/en/how-to/faq/article/how-do-i-access-my-qnap-nas-using-ssh) into your NAS, and install the QPKG manually at the command-prompt:
```
curl -skL https://tinyurl.com/get-sherpa > /share/Public/sherpa.qpkg;
sudo sh /share/Public/sherpa.qpkg
```

## Usage


- At the command-prompt, run:

```
sudo sherpa
```

... and follow the help from there.

If you have suggestions, advice, comments or concerns, please either create a new [issue](https://github.com/OneCDOnly/sherpa/issues/new), or you are most welcome to start a new [discussion](https://github.com/OneCDOnly/sherpa/discussions/new/choose) topic.

This project is a community effort, and has been built with the combined efforts of many community members on the [QNAP](https://forum.qnap.com/viewtopic.php?f=320&t=132373) community forum. Thank you to everyone who has contributed. 🤓

Checkout the wiki for more information: [https://github.com/OneCDOnly/sherpa/wiki](https://github.com/OneCDOnly/sherpa/wiki)
Binary file modified objects.tar.gz
Binary file not shown.
Binary file modified packages.tar.gz
Binary file not shown.
Binary file modified sherpa-manager.tar.gz
Binary file not shown.
11 changes: 8 additions & 3 deletions support/build-wiki-package-abbreviations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,14 @@ target_pathfile=$wiki_path/Package-abbreviations.md
Objects:Load
Packages:Load 2>/dev/null # packages source file throws a lot of syntax errors until it's processed - ignore these.

printf 'These abbreviations are recognised by **sherpa** and may be used in-place of each [package name](Packages):\n\n' > "$target_pathfile"
echo '| package name | acceptable abbreviations |' >> "$target_pathfile"
echo '| ---: | :--- |' >> "$target_pathfile"
{

echo -e '![Static Badge](https://img.shields.io/badge/page_status-live-green?style=for-the-badge)\n'
echo -e 'These abbreviations are recognised by **sherpa** and may be used in-place of each [package name](Packages):\n'
echo '| package name | acceptable abbreviations |'
echo '| ---: | :--- |'

} > "$target_pathfile"

for package_name in $(QPKGs-GRall:Array); do
abs=$(QPKG.Abbrvs "$package_name")
Expand Down
4 changes: 2 additions & 2 deletions support/highest_package_versions_found.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ SABnzbd_240426_x86_64.qpkg.md5 SABnzbd_240426_x86_64.qpkg SABnzbd
SABnzbd_240426_x86.qpkg.md5 SABnzbd_240426_x86.qpkg SABnzbd 240426 i86 845d18b588e8eac34f917ef137fb4fd5
sha3sum_230312_x86_64.qpkg.md5 sha3sum_230312_x86_64.qpkg sha3sum 230312 i64 6ceba9116e0dbcbdb4e6112f0c02f8c0
sha3sum_230312_x86.qpkg.md5 sha3sum_230312_x86.qpkg sha3sum 230312 i86 fdba9d16b88a5b6e3b04483ca77706dd
sherpa_240427.qpkg.md5 sherpa_240427.qpkg sherpa 240427 all 8f97e0a94dd0d08c9b09b805eca8d915
SortMyQPKGs_240225.qpkg.md5 SortMyQPKGs_240225.qpkg SortMyQPKGs 240225 all 44643edd1a10db13caa48a46f0a8d3c5
sherpa_240428.qpkg.md5 sherpa_240428.qpkg sherpa 240428 all 8bac70224e620d0a267b681fbdd69c4f
SortMyQPKGs_240427.qpkg.md5 SortMyQPKGs_240427.qpkg SortMyQPKGs 240427 all 9392283f02079fa586f8d03d96f0be17
Unrar_6.2.5_arm_64.qpkg.md5 Unrar_6.2.5_arm_64.qpkg Unrar 6.2.5 a64 e2382b80908fc9549bbb00058968082a
Unrar_6.2.5_arm-x41.qpkg.md5 Unrar_6.2.5_arm-x41.qpkg Unrar 6.2.5 a41 ac1ff1149258db5e4c0b8165774eda37
Unrar_6.2.5_x86_64.qpkg.md5 Unrar_6.2.5_x86_64.qpkg Unrar 6.2.5 i64 f29dc4c271a0a1341d2dad78eb34d2ca
Expand Down
Loading

0 comments on commit 8554f3d

Please sign in to comment.