Skip to content

feat: attempt to resolve performance issues with rm earlier in build … #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 20, 2025
Merged

feat: attempt to resolve performance issues with rm earlier in build … #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
12537b7
feat: attempt to resolve performance issues with rm earlier in build …
elibosley Feb 19, 2025
90bc7b1
feat: attempt to use .noremove to fix install slowness
elibosley Feb 19, 2025
dcf7378
fix: no symlinks
elibosley Feb 19, 2025
9d7367c
warn on removepkg call
elibosley Feb 19, 2025
49580a3
feat: try only removing package on removal, not upgrades
elibosley Feb 19, 2025
f088673
feat: don't uninstall on upgrade
elibosley Feb 20, 2025
f45f866
fix: sha256 check moved
elibosley Feb 20, 2025
7e670f2
fix: revert kill command
elibosley Feb 20, 2025
f6d75d8
fix: add echo statements
elibosley Feb 20, 2025
c18bee3
fix: missing closing brace
elibosley Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions plugin/plugins/dynamix.unraid.net.plg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ sha256check() {
fi
}
]]>
sha256check "&source;.txz" "&SHA256;"
exit 0
sha256check "&source;.txz" "&SHA256;"
exit 0
</INLINE>
</FILE>
<FILE Name="/boot/config/plugins/dynamix.my.servers/&NODEJS_FILENAME;">
Expand Down Expand Up @@ -149,6 +149,7 @@ sha256check() {
fi

echo "Node.js installation successful"

exit 0
]]>
</INLINE>
Expand All @@ -166,6 +167,7 @@ sha256check() {
<![CDATA[
# before proceeding with install, doubly confirm downloaded files exist. just being pedantic.
FILE=${MAINTXZ} && [[ ! -f "$FILE" ]] && echo "⚠️ file missing - $FILE" && exit 1

exit 0
]]>
</INLINE>
Expand Down Expand Up @@ -203,9 +205,6 @@ echo "**********************************\n";
echo "🧹 CLEANING UP - may take a minute\n";
echo "**********************************\n";

# Clean up node_modules before package removal
rm -rf /usr/local/unraid-api/node_modules

if (file_exists("/boot/.git")) {
if (file_exists("/etc/rc.d/rc.flash_backup")) {
# stop flash backup service
Expand Down Expand Up @@ -339,8 +338,8 @@ exit(0);
<!-- uninstall existing plugin during update or removal -->
<FILE Run="/bin/bash" Method="install remove">
<INLINE>
MAINNAME="&name;"
<![CDATA[
echo "Uninstalling existing plugin"
version=
# shellcheck disable=SC1091
source /etc/unraid-version
Expand All @@ -366,8 +365,28 @@ if [ -e /etc/rc.d/rc.unraid-api ]; then
# uninstall the api
rm -rf /usr/local/unraid-api
rm -rf /var/run/unraid-api.sock
# uninstall the main source package
[[ -f "/var/log/packages/${MAINNAME}" ]] && removepkg --terse "${MAINNAME}"
fi
]]>
</INLINE>
</FILE>

<FILE Run="/bin/bash" Method="remove">
<INLINE>
MAINNAME="&name;"
<![CDATA[
echo "Removing Plugin"
[[ -f "/var/log/packages/${MAINNAME}" ]] && removepkg --terse "${MAINNAME}"
]]>
</INLINE>
</FILE>

<!-- uninstall existing plugin during removal -->
<FILE Run="/bin/bash" Method="install remove">
<INLINE>
<![CDATA[
echo "Restoring Files"

if [ -e /etc/rc.d/rc.unraid-api ]; then
# restore stock files
FILES_TO_RESTORE=(
"/usr/local/emhttp/plugins/dynamix/DisplaySettings.page"
Expand Down
Loading
Loading