This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
This repository was archived by the owner on Aug 12, 2026. It is now read-only.

Provide better output on toltecctl uninstall - #692

Open
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10
Open

Provide better output on toltecctl uninstall#692
Eeems wants to merge 37 commits into
testingfrom
Eeems-patch-10

Conversation

@Eeems

@EeemsEeems commented May 10, 2023

Copy link
Copy Markdown
Member
  • Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
  • Make changes to toltecctl to get closer to allowing the installation to be somewhere other than /opt, not that entware supports that yet.
  • Make toltecctl uninstall handle unexpected states like partial uninstall a lot better.
  • Backup toltecctl on uninstall to continue allowing users to uninstall if something goes wrong.
  • Fix issues with installdepends not properly being set for several packages that caused them to be removed after their dependencies were removed, thus breaking uninstall.

Provide output right at the end if a removal fails due to a preremove script. That way, the user can double-check the output to see if there is something bad. For example, kernelctl failed to revert to the stock kernel.
@EeemsEeems added the packages Add or improve packages of the repository label May 10, 2023
@Eeems
Eeems requested a review from matteodelabreMay 10, 2023 18:29
@Eeems
Eeems marked this pull request as ready for review May 10, 2023 18:33
@EeemsEeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@rM-self-serve

Copy link
Copy Markdown
Contributor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

@Eeems

Eeems commented Dec 8, 2023

Copy link
Copy Markdown
MemberAuthor

I created a test package that will fail during preremove.
Do you have any tips on restoring /opt after uninstalling?

Uninstall removes /opt, which is actually /home/root/.entware. you will have to install again with bootstrap. If you want to avoid doing so, you can copy the .entware folder before doing the uninstall, rename the copy to .entware after uninstalling and then re-enable.

Comment threadpackage/toltec-bootstrap/toltecctl Outdated
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl
Comment threadpackage/toltec-bootstrap/toltecctl Outdated
set -o functrace
trap 'handle-error ${LINENO}' ERR
handle-exit() {
if ! $completed && $success && $clean; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

completed vs complete, wrong variable names

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be reviewing an outdated version, this is $complete for me when I look

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm reviewing patches in order, not a full diff. I'm more used to a workflow where a PR is force updated instead of incremental patches and a squash afterwards.

@HavnerHavnerSep 7, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think there is operator order issue here:

$ export VAR1=true
$ export VAR2=true
$ export VAR3=true
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ export VAR2=false
$ if ! $VAR1 && $VAR2 && $VAR3; then echo failed; fi
$ if ! ($VAR1 && $VAR2 && $VAR3); then echo failed; fi
failed

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since they are declared as local it could be that they aren't working as expected. Although when I tested this originally it was working as I expected.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think local makes any difference here, ! has higher priority than && hence it applies only to VAR1 and from the look of it you wanted to apply it to the whole expression (V1 && V2 && V3)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have wrapped it in ( and ) if I was trying to apply it to all of them, I'm checking if not complete, and success and clean. success/clean are true by default and get changed to false when something else handles reporting an error.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok then. From reading the code it looked to me like you are looking for a failure scenario (e.g. at least one of those vars is false).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I'm only wanting to handle the error if the error handler is triggered and we did not complete the uninstall, and nothing set success or clean to false due to their own error handling.

It is less than ideal, thus the extra comments on the variable declarations. I couldn't really come up with a cleaner way to handle this with the limitations bash has on error handling.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have to analyze this fully to check the logic completely. I'm too tired now.

What I did find though is that you make a dep between clean and success so checking both in this line might be at least redundant.

https://github.com/toltec-dev/toltec/blob/Eeems-patch-10/package/toltec-bootstrap/toltecctl#L885

But I'm not able to check the logic fully now.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

packagesAdd or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Eeems@rM-self-serve@Havner@Jayy001