Skip to content
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

fix: bypass distrobox upgrade sudo checks #69

Merged
merged 6 commits into from
Sep 20, 2023
Merged

fix: bypass distrobox upgrade sudo checks #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02f6253
fix: bypass distrobox upgrade sudo checks
gerblesh Sep 20, 2023
c1ae643
chore: remove extra println
gerblesh Sep 20, 2023
70411d7
style: remove extra newlines
gerblesh Sep 20, 2023
c19470d
Merge branch 'main' into fix-distrobox-update
gerblesh Sep 20, 2023
b90fccf
style: use unset keyword
gerblesh Sep 20, 2023
b385363
Merge branch 'fix-distrobox-update' of https://github.com/ublue-os/ub…
gerblesh Sep 20, 2023
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
1 change: 1 addition & 0 deletions files/etc/ublue-update.d/user/02-distrobox-user-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash

if [ -x /usr/bin/distrobox ]; then
unset SUDO_USER # avoid distrobox sudo checks
/usr/bin/distrobox upgrade -a
fi
7 changes: 5 additions & 2 deletions src/ublue_update/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,11 @@ def run_update_scripts(root_dir: str):
)
if out.returncode != 0:
log.error(
f"{full_path} returned error code: {out.returncode}",
out.stdout.decode("utf-8"),
f"""{full_path} returned error code: {out.returncode}

Program output:
{out.stdout.decode("utf-8")}
""",
)
notify(
"System Updater",
Expand Down