Update qutebrowser to v2

andys8 · Feb 9, 2021 · 5294ff8 · 5294ff8
1 parent 31cc6ce
commit 5294ff8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/qutebrowser/config.py b/qutebrowser/config.py
@@ -22,7 +22,7 @@
 ## Type: Dict
 # c.aliases = {'w': 'session-save', 'q': 'quit', 'wq': 'quit --save'}
 c.aliases = {
-    'adblock-toggle': 'config-cycle -t content.host_blocking.enabled',
+    'adblock-toggle': 'config-cycle -t content.blocking.enabled',
     'chromium': 'spawn --detach chromium {url}',
     'incognito': 'open --private',
     'lastpass': 'hint --first inputs ;; spawn --userscript qute-lastpass',
@@ -667,7 +667,7 @@
 
 ## Enable host blocking.
 ## Type: Bool
-c.content.host_blocking.enabled = True
+c.content.blocking.enabled = True
 
 ## List of URLs of lists which contain hosts to block.  The file can be
 ## in one of the following formats:  - An `/etc/hosts`-like file - One
@@ -689,7 +689,7 @@
 ## from hostblocking.
 ## Type: List of UrlPattern
 # c.content.host_blocking.whitelist = []
-c.content.host_blocking.whitelist = ['www.googleadservices.com']
+c.content.blocking.whitelist = ['www.googleadservices.com']
 
 ## Enable hyperlink auditing (`<a ping>`).
 ## Type: Bool

diff --git a/scripts/check-postconditions.sh b/scripts/check-postconditions.sh
@@ -121,7 +121,7 @@ MAX_BRIGHTNESS=$(cat /sys/class/backlight/*/max_brightness)
 
 # qutebrowser min version
 QUTEBROWSER_VERSION=$(qutebrowser --version | grep "qutebrowser v")
-[[ $QUTEBROWSER_VERSION =~ v1\.1[4-9]\. ]] || {
+[[ $QUTEBROWSER_VERSION =~ v2\.[0-9]\. ]] || {
     fail "Qutebrowser version not expected ($QUTEBROWSER_VERSION)"
 }
 

diff --git a/scripts/update-qutebrowser.sh b/scripts/update-qutebrowser.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-VERSION_MINT="1.14.1"
+VERSION_MINT="2.0.2"
 VERSION_MINT_ALL="$VERSION_MINT-1"
 
 LINUX=$(lsb_release -i -s)
@@ -28,11 +28,11 @@ if [ "$LINUX" = "linuxmint" ]; then
     DEB2=qutebrowser-qtwebengine_${VERSION_MINT_ALL}_all.deb
 
     echo "Download qutebrowser packages"
-    curl "$BASE_URL/$DEB1" -o "/tmp/$DEB1"
-    curl "$BASE_URL/$DEB2" -o "/tmp/$DEB2"
+    curl "$BASE_URL/$DEB1" -o "/tmp/$DEB1" -v
+    curl "$BASE_URL/$DEB2" -o "/tmp/$DEB2" -v
 
     echo "Qutebrowser: dpkg -i (please enter password)"
-    sudo dpkg -i --force-depends --force-depends-version "/tmp/$DEB1" "/tmp/$DEB2"
+    sudo apt install "/tmp/$DEB1" "/tmp/$DEB2"
     echo "Qutebrowser: Fix dependencies "
     sudo apt-get install --fix-broken --assume-yes