[merge] from unstable into stable

OneCDOnly · Apr 29, 2024 · 32d2fb4 · 32d2fb4
2 parents 6a6f249 + 126cd1f
commit 32d2fb4
Show file tree

Hide file tree

Showing 13 changed files with 270 additions and 229 deletions.
diff --git a/docs/QNAP-forum-announcement.bbcode b/docs/QNAP-forum-announcement.bbcode
@@ -19,7 +19,7 @@ That said: the majority of development is now complete, and I'm currently workin
 [list]
 [*][url=https://www.qnap.com/en/how-to/faq/article/how-do-i-access-my-qnap-nas-using-ssh][b]SSH[/b][/url] into your NAS, and install the QPKG manually at the command-prompt:
 [code]curl -skL https://tinyurl.com/get-sherpa > /share/Public/sherpa.qpkg;
-sudo sh /share/Public/sherpa.qpkg
+sudo sh /share/Public/sherpa.qpkg;
 [/code]
 [/list]
 [b][u][size=120]Usage[/size][/u][/b]
@@ -34,6 +34,6 @@ If 'sudo' is unavailable in your version of QTS, [url=https://www.qnap.com/en/ho
 
 If you have suggestions, advice, comments or concerns, please either create a new [url=https://github.com/OneCDOnly/sherpa/issues/new]issue[/url], or you are most welcome to start a new [url=https://github.com/OneCDOnly/sherpa/discussions/new/choose]discussion[/url] topic.
 
-This project is a community effort, and has been built with the combined efforts of many community members on the [url=https://forum.qnap.com/viewtopic.php?f=320&t=132373]QNAP[/url] community forum. Thank you to everyone who has contributed. 🤓
+This project is a community effort, and has been built with the combined feedback of many community members on the [url=https://forum.qnap.com/viewtopic.php?f=320&t=132373]QNAP[/url] community forum. Thank you to everyone who has contributed. 🤓
 
 Checkout the wiki for more information: https://github.com/OneCDOnly/sherpa/wiki
diff --git a/docs/README.md b/docs/README.md
@@ -17,7 +17,7 @@ Package management via **sherpa** provides features like easy application backup
 - [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
+sudo sh /share/Public/sherpa.qpkg;
 ```
 ## Usage
 - At the command-prompt, run:
@@ -28,6 +28,6 @@ sudo sherpa
 
 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. 🤓
+This project is a community effort, and has been built with the combined feedback 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)
diff --git a/objects.tar.gz b/objects.tar.gz
diff --git a/packages.tar.gz b/packages.tar.gz
diff --git a/sherpa-manager.tar.gz b/sherpa-manager.tar.gz
diff --git a/support/highest_package_versions_found.tbl b/support/highest_package_versions_found.tbl
diff --git a/support/merge-into-stable-and-release.sh b/support/merge-into-stable-and-release.sh
@@ -27,16 +27,16 @@ cp -f "$qpkgs_path/sherpa/build/sherpa_${build_date}.qpkg" "$qpkgs_path/sherpa/b
 cd $HOME/scripts/nas/sherpa || exit
 
 git checkout "$stable_branch" || exit
-git merge --no-ff -m "[merge] from \`$unstable_branch\` into \`$stable_branch\`" "$unstable_branch" && git push || exit
+git merge --no-ff -m "[merge] from \`$unstable_branch\` into \`$stable_branch\`" "$unstable_branch" && git push #|| exit
 git tag "$release_tag"
 git push --tags
-git checkout "$unstable_branch" || exit
+git checkout "$unstable_branch" #|| exit
 
 gh release create "$release_tag" --generate-notes "$qpkgs_path/sherpa/build/sherpa.qpkg"
 
 cd $HOME/scripts/nas/sherpa/support || exit
 
 ./reset-qpkg-datetimes.sh || exit
-git diff			# run this now so don't need to wait during user check.
+git diff			# run this now so don't need to wait during manual (user) check.
 
 exit 0