nosignal/DaVinci-Resolve-Linux-Mint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from 28allday/claude/review-code-bugs-ZmbMw

Browse source 
Fix pipefail, privilege check, and glob safety bugs
This commit is contained in:
Gavin Nugent 2026-04-01 08:34:04 +01:00 • committed by GitHub
commit a8b494f41e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
DR_MINT.sh
View file

@ -24,10 +24,16 @@
set -eo pipefail # Exit immediately if any command fails; catch pipe failures too set -eo pipefail # Exit immediately if any command fails; catch pipe failures too
# Ensure the script is run with root privileges (needed for apt, chown, etc.)
if [ "$(id -u)" -ne 0 ]; then
echo "Error: This script must be run with sudo (e.g., sudo ./DR_MINT.sh)."
exit 1
fi
# Resolve the real user even when running with sudo. logname returns the # Resolve the real user even when running with sudo. logname returns the
# user who originally logged in, not "root". This ensures we look for the # user who originally logged in, not "root". This ensures we look for the
# ZIP in the correct home directory and set proper file ownership. # ZIP in the correct home directory and set proper file ownership.
ACTIVE_USER=$(logname) ACTIVE_USER=$(logname 2>/dev/null || echo "${SUDO_USER:-$USER}")
HOME_DIR=$(getent passwd "$ACTIVE_USER" | cut -d: -f6) HOME_DIR=$(getent passwd "$ACTIVE_USER" | cut -d: -f6)
DOWNLOADS_DIR="$HOME_DIR/Downloads" DOWNLOADS_DIR="$HOME_DIR/Downloads"
EXTRACTION_DIR="/opt/resolve" EXTRACTION_DIR="/opt/resolve"
@ -92,7 +98,7 @@ cd "$DOWNLOADS_DIR"
# We extract it to a temporary DaVinci_Resolve/ directory, set ownership # We extract it to a temporary DaVinci_Resolve/ directory, set ownership
# to the real user (not root), and make files executable. # to the real user (not root), and make files executable.
echo "Extracting DaVinci Resolve installer..." echo "Extracting DaVinci Resolve installer..."
ZIP_FILE=$(find . -maxdepth 1 -type f -name "$ZIP_FILE_PATTERN" | head -n 1) ZIP_FILE=$(find . -maxdepth 1 -type f -name "$ZIP_FILE_PATTERN" -print -quit)
if [ -z "$ZIP_FILE" ]; then if [ -z "$ZIP_FILE" ]; then
echo "Error: DaVinci Resolve ZIP file not found in $DOWNLOADS_DIR." echo "Error: DaVinci Resolve ZIP file not found in $DOWNLOADS_DIR."
exit 1 exit 1
@ -117,8 +123,8 @@ chmod -R u+rwX,go+rX DaVinci_Resolve
# Qt environment variables are set so the installer can find the system's # Qt environment variables are set so the installer can find the system's
# Qt5 plugins for rendering its UI. # Qt5 plugins for rendering its UI.
echo "Running the DaVinci Resolve installer..." echo "Running the DaVinci Resolve installer..."
cd DaVinci_Resolve cd "$DOWNLOADS_DIR/DaVinci_Resolve"
INSTALLER_FILE=$(find . -type f -name "DaVinci_Resolve_*.run" | head -n 1) INSTALLER_FILE=$(find . -type f -name "DaVinci_Resolve_*.run" -print -quit)
if [ -z "$INSTALLER_FILE" ]; then if [ -z "$INSTALLER_FILE" ]; then
echo "Error: DaVinci Resolve installer (.run) file not found in extracted directory." echo "Error: DaVinci Resolve installer (.run) file not found in extracted directory."
exit 1 exit 1
@ -163,8 +169,9 @@ echo "Resolving library conflicts..."
if [ -d "$EXTRACTION_DIR/libs" ]; then if [ -d "$EXTRACTION_DIR/libs" ]; then
cd "$EXTRACTION_DIR/libs" cd "$EXTRACTION_DIR/libs"
sudo mkdir -p not_used sudo mkdir -p not_used
sudo mv libgio* not_used || true for lib in libgio* libgmodule*; do
sudo mv libgmodule* not_used || true [ -e "$lib" ] && sudo mv "$lib" not_used/
done
if [ -f /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 ]; then if [ -f /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 ]; then
sudo cp /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 "$EXTRACTION_DIR/libs/" sudo cp /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 "$EXTRACTION_DIR/libs/"