diff --git a/scripts/bin/installers/blackmagic-parser.py b/scripts/bin/installers/blackmagic-parser.py index 595c4eb..f19743d 100644 --- a/scripts/bin/installers/blackmagic-parser.py +++ b/scripts/bin/installers/blackmagic-parser.py @@ -33,9 +33,9 @@ def getURLId(url): # getURLVersion() returns the url version number. def getURLVersion(url): if 'Beta' in url['downloadTitle']: - beta = re.search('Beta \d+', url['downloadTitle']) + beta = re.search('Beta \\d+', url['downloadTitle']) if beta: - beta = re.search('\d+', beta.group()).group() + beta = re.search('\\d+', beta.group()).group() else: beta = '99' return '{}.{}.{}.{}'.format(url['major'], url['minor'], url['releaseNum'], beta) diff --git a/scripts/bin/installers/resolve-install.sh b/scripts/bin/installers/resolve-install.sh index 5387ef7..2bb773d 100755 --- a/scripts/bin/installers/resolve-install.sh +++ b/scripts/bin/installers/resolve-install.sh @@ -5,6 +5,20 @@ # Import library source $(dirname ${BASH_SOURCE[0]})/install-lib.sh +# Graphics card fix +function graphicsCardFix() { + sudo rm /etc/OpenCL/vendors/mesa.icd + sudo rm /etc/OpenCL/vendors/pocl.icd +} + +# gLib fix +function glibFix() { + sudo mkdir /opt/resolve/libs/_disabled + sudo mv /opt/resolve/libs/libglib-2.0.so* /opt/resolve/libs/_disabled + sudo mv /opt/resolve/libs/libgio-2.0.so* /opt/resolve/libs/_disabled + sudo mv /opt/resolve/libs/libgmodule-2.0.so* /opt/resolve/libs/_disabled +} + versionFile=/opt/resolve/version.txt resolveVersion=$(cat /opt/resolve/docs/ReadMe.html | grep 'DaVinci Resolve Studio' | filterVersion) @@ -77,18 +91,12 @@ if [ ! -f ./*${installerName}_Linux.run ]; then fi echo "Installing ./*${installerName}_Linux.run" chmod +x ./*${installerName}_Linux.run -sudo ./*${installerName}_Linux.run -i -y +sudo SKIP_PACKAGE_CHECK=1 ./*${installerName}_Linux.run -i -y # Version number backup sudo echo $urlVersion > $versionFile -# Graphics card fix -sudo rm /etc/OpenCL/vendors/mesa.icd -sudo rm /etc/OpenCL/vendors/pocl.icd - -# gLib fix -sudo mkdir /opt/resolve/libs/_disabled -sudo mv /opt/resolve/libs/libglib-2.0.so* /opt/resolve/libs/_disabled +glibFix # Keyboard mapping fix setxkbmap -option 'caps:super'