mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-01-26 09:35:24 +00:00
fix(ujust): Fix faulty ujust install-resolve (#1342)
* chore(ujust): move install-resolve cache to /var/tmp * fix(ujust): avoid selinux conflict in install-resolve In return, the user is requested to run davincibox setup script manually * fix(ujust): fix nvidia detection in davincibox script * fix(ujust): Add missing cache removal * fix(ujust): Avoid use tmpfs for davincibox script This is to avoid filling tmpfs with Appimage extraction * fix(ujust): Handle better cache removal - Copy install-resolve install command to clipboard * chore(ujust): minor prompt tweak to install-resolve * fix(ujust): minor prompt change * fix(ujust): fix prompt selection logic * fix(ujust): faulty appimage extraction * chore(ujust): removing redudant rm * chore(ujust): update script url in install-resolve This version implements the nvidia detection fix * chore(ujust): remove redundant nvidia detection workaround
This commit is contained in:
parent
996d161bfb
commit
14ee75d7c8
@ -162,8 +162,11 @@ install-resolve ACTION="":
|
||||
#!/usr/bin/bash
|
||||
source /usr/lib/ujust/ujust.sh
|
||||
set -eo pipefail
|
||||
SCRIPT_URL="https://raw.githubusercontent.com/zelikos/davincibox/d089ea16fd674018ec48f06cb9f563ec1e6a1514/setup.sh"
|
||||
SCRIPT_URL="https://raw.githubusercontent.com/zelikos/davincibox/b84fa22473d57307be50c07d968302e1cb458e13/setup.sh"
|
||||
DOWNLOADDIR=$(xdg-user-dir DOWNLOAD || echo ${HOME})
|
||||
tmpdir=/var/tmp/bazzite_davincibox_setup.tmp
|
||||
mkdir -p $tmpdir
|
||||
trap "rm -rf ${tmpdir}" INT EXIT HUP
|
||||
OPTION={{ ACTION }}
|
||||
if [ "$OPTION" == "help" ]; then
|
||||
echo "Usage: ujust install-resolve <option>"
|
||||
@ -188,7 +191,7 @@ install-resolve ACTION="":
|
||||
echo "${bold}This script requires you to download DaVinci Resolve installer manually from their website and place it in ${HOME} or ${DOWNLOADDIR}${n}"
|
||||
echo "${bold}https://www.blackmagicdesign.com/event/davinciresolvedownload${n}"
|
||||
# Get sure user reads instructions
|
||||
ugum confirm --default "" || exit 0
|
||||
ugum confirm || exit 0
|
||||
# Download davincibox setup script
|
||||
SETUPSCRIPT=/tmp/davincibox_setup.sh
|
||||
wget -O $SETUPSCRIPT ${SCRIPT_URL}
|
||||
@ -199,11 +202,8 @@ install-resolve ACTION="":
|
||||
runfile=$(Choose ${possible_installers[@]})
|
||||
if [[ ! -z $runfile && -f $runfile ]]; then
|
||||
if [[ $runfile =~ .zip$ ]]; then
|
||||
dir=$HOME/.cache/bazzite_davincibox_setup
|
||||
mkdir -p $dir && rm -rf $dir/*
|
||||
unzip -d "$dir" "$runfile"
|
||||
trap "[[ $dir =~ /.cache/ ]] && rm $dir -rf" EXIT INT
|
||||
RUNFILE=$dir/*.run
|
||||
unzip -o -d "$tmpdir" "$runfile"
|
||||
RUNFILE=$(find $tmpdir -executable -name "DaVinci_Resolve_*.run")
|
||||
else
|
||||
RUNFILE="$runfile"
|
||||
fi
|
||||
@ -213,9 +213,8 @@ install-resolve ACTION="":
|
||||
echo "${red}Please place the file DaVinci_Resolve_*_Linux.run in ${HOME} or ${DOWNLOADDIR}${n}";
|
||||
exit 1
|
||||
fi
|
||||
$SETUPSCRIPT $RUNFILE
|
||||
echo "${b}Instalation was successful${n}"
|
||||
echo "${dim}TIP: You can always update by running 'ujust install-resolve'${n}"
|
||||
bash <<< "env -C ${tmpdir} $SETUPSCRIPT $RUNFILE"
|
||||
echo "davincibox was successfully installed"
|
||||
elif [[ "${OPTION,,}" =~ (^uninstall[[:space:]]davincibox) ]]; then
|
||||
ugum confirm "Confirm davincibox uninstall?" || exit 0
|
||||
# Remove the existing container
|
||||
|
Loading…
x
Reference in New Issue
Block a user