forked from SynoCommunity/spksrc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update SABnzbd to 4.2.1 (SynoCommunity#5968)
* Update SABnzbd to 4.2.0 * Use SERVICE_WIZARD_SHARENAME * Update wizards for SHARENAME - The upgrade wizard identifies an existing share name. If it's not found, an additional screen will appear for user confirmation. * Adjust wizard SHARENAME check * Update to 4.2.1 --------- Co-authored-by: mreid-tt <[email protected]>
- Loading branch information
Showing
9 changed files
with
129 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| SABnzbd-4.1.0-src.tar.gz SHA1 7ed45efca18ee589ad24a6fa43ae22a47661aa6e | ||
| SABnzbd-4.1.0-src.tar.gz SHA256 24cdc711a9a9425b65b53dd5c084f78cc0f6d978c5c712481b7031751d569588 | ||
| SABnzbd-4.1.0-src.tar.gz MD5 f1033e949168250aef5500ab919938e6 | ||
| SABnzbd-4.2.1-src.tar.gz SHA1 642a1d8fbeea42b7f7273675ab5e4f7f1a0d921e | ||
| SABnzbd-4.2.1-src.tar.gz SHA256 0d59eefd883774fcb9e3f58a073f4e53467341b34026db08dce506625052ab49 | ||
| SABnzbd-4.2.1-src.tar.gz MD5 b5489f668a5e528d4176930e9bead006 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # cross-compiled wheels | ||
| cffi==1.15.1 | ||
| cffi==1.16.0 | ||
| Cheetah3==3.2.6 | ||
| sabctools==7.1.2 | ||
| orjson==3.9.7 | ||
| sabctools==8.1.0 | ||
| orjson==3.9.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| #!/bin/bash | ||
|
|
||
| page_append () | ||
| { | ||
| if [ -z "$1" ]; then | ||
| echo "$2" | ||
| elif [ -z "$2" ]; then | ||
| echo "$1" | ||
| else | ||
| echo "$1,$2" | ||
| fi | ||
| } | ||
|
|
||
| CFG_FILE="/var/packages/${SYNOPKG_PKGNAME}/var/config.ini" | ||
| # Extract share path and name from application config | ||
| CONFIGURED_SHARE_PATH=$(awk -F' = ' '/^download_dir/{split($2, path, "/"); print "/" path[2] "/" path[3]}' "${CFG_FILE}") | ||
| CONFIGURED_SHARE_NAME=$(echo "${CONFIGURED_SHARE_PATH}" | awk -F'/' '{print $NF}') | ||
|
|
||
| VAR_FILE="/var/packages/${SYNOPKG_PKGNAME}/etc/installer-variables" | ||
| # Extract share path from installer variables or configured shares | ||
| PACKAGE_SHARE_PATH=$(awk -F'=' '/^SHARE_PATH=/{print $2}' "${VAR_FILE}" 2>/dev/null || echo "") | ||
| if [ -z "$PACKAGE_SHARE_PATH" ] && [ -d "/var/packages/${SYNOPKG_PKGNAME}/shares" ]; then | ||
| PACKAGE_SHARE_PATH=$(realpath "/var/packages/${SYNOPKG_PKGNAME}/shares/${CONFIGURED_SHARE_NAME}" 2>/dev/null || echo "") | ||
| fi | ||
| # Extract share name from installer variables or configured shares | ||
| PACKAGE_SHARE_NAME=$(awk -F'=' '/^SHARE_NAME=/{print $2}' "${VAR_FILE}" 2>/dev/null || echo "") | ||
| if [ -z "$PACKAGE_SHARE_NAME" ] && [ -d "/var/packages/${SYNOPKG_PKGNAME}/shares/${CONFIGURED_SHARE_NAME}" ]; then | ||
| PACKAGE_SHARE_NAME=${CONFIGURED_SHARE_NAME} | ||
| fi | ||
|
|
||
| # Check for data share | ||
| check_data_share () | ||
| { | ||
| if [ -n "${PACKAGE_SHARE_NAME}" ]; then | ||
| return 0 # true | ||
| elif [ -n "$CONFIGURED_SHARE_PATH" ] && [ -n "$PACKAGE_SHARE_PATH" ] && [ "$CONFIGURED_SHARE_PATH" = "$PACKAGE_SHARE_PATH" ]; then | ||
| # If consistent data share path, assume share name is correct | ||
| return 0 # true | ||
| else | ||
| return 1 # false | ||
| fi | ||
| } | ||
|
|
||
| PAGE_SHARE_UPGRADE=$(/bin/cat<<EOF | ||
| { | ||
| "step_title": "Shared Folder Upgrade", | ||
| "invalid_next_disabled_v2": true, | ||
| "items": [{ | ||
| "type": "textfield", | ||
| "desc": "The download folder for this package must now be located within a data share. As per the existing configuration, the identified data share for your downloads is:", | ||
| "subitems": [{ | ||
| "key": "wizard_shared_folder_name", | ||
| "desc": "Shared Folder", | ||
| "defaultValue": "${CONFIGURED_SHARE_NAME}", | ||
| "validator": { | ||
| "allowBlank": false, | ||
| "regex": { | ||
| "expr": "/^[\\\w _-]+$/", | ||
| "errorText": "Subdirectories are not supported." | ||
| } | ||
| } | ||
| }] | ||
| },{ | ||
| "desc": "IMPORTANT: If your download folder is not currently located in the specified share, a new share will be created. After the upgrade, you may need to manually update your configuration to reflect this new location." | ||
| }] | ||
| } | ||
| EOF | ||
| ) | ||
|
|
||
| PAGE_DSM_PERMISSIONS=$(/bin/cat<<EOF | ||
| { | ||
| "step_title": "DSM Permissions", | ||
| "items": [{ | ||
| "desc": "Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details." | ||
| },{ | ||
| "type": "textfield", | ||
| "subitems": [{ | ||
| "key": "wizard_shared_folder_name", | ||
| "defaultValue": "${CONFIGURED_SHARE_NAME}", | ||
| "hidden": true | ||
| }] | ||
| }] | ||
| } | ||
| EOF | ||
| ) | ||
|
|
||
| main () { | ||
| local upgrade_page="" | ||
| if ! check_data_share; then | ||
| upgrade_page=$(page_append "$upgrade_page" "$PAGE_SHARE_UPGRADE") | ||
| else | ||
| upgrade_page=$(page_append "$upgrade_page" "$PAGE_DSM_PERMISSIONS") | ||
| fi | ||
| echo "[$upgrade_page]" > "${SYNOPKG_TEMP_LOGFILE}" | ||
| } | ||
|
|
||
| main "$@" |