Skip to content

prefer pkexec over sudo in PINCE.sh #289

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

Open
notwithering wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prefer pkexec over sudo in PINCE.sh #289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 25 additions & 4 deletions PINCE.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,29 @@ if [ ! -d "${SCRIPTDIR}/.venv/PINCE" ]; then
exit 1
fi
. ${SCRIPTDIR}/.venv/PINCE/bin/activate
PINCE_PATH="${SCRIPTDIR}/PINCE.py"

# Preserve env vars to keep settings like theme preferences.
# Debian/Ubuntu does not preserve PATH through sudo even with -E for security reasons
# so we need to force PATH preservation with venv activated user's PATH.
sudo -E --preserve-env=PATH PYTHONDONTWRITEBYTECODE=1 ${SCRIPTDIR}/.venv/PINCE/bin/python3 ${SCRIPTDIR}/PINCE.py
export PYTHONDONTWRITEBYTECODE=1

run_with_pkexec() {
# Preserve env vars to keep settings like theme preferences.
# Pkexec does not support passing all of env via a flag like `-E` so we need to
# rebuild the env and then pass it through.
ENV=(env)
while IFS='=' read -r key value; do
CMD+=("$key=$value")
done < <(env)

pkexec env "${CMD[@]}" python3 "$PINCE_PATH"
}

run_with_sudo() {
# Debian/Ubuntu does not preserve PATH through sudo even with -E for security reasons
# so we need to force PATH preservation with venv activated user's PATH.
sudo -E --preserve-env=PATH,PYTHONDONTWRITEBYTECODE python3 "$PINCE_PATH"
}

# Prefer pkexec, fallback to sudo.
if ! run_with_pkexec; then
run_with_sudo
fi