From 5005ca736ff6ec3e5656fb540e87b624ebfa9117 Mon Sep 17 00:00:00 2001 From: bryan Date: Mon, 21 Oct 2024 23:18:45 -0400 Subject: [PATCH] Fix libwebkit removal regex --- installJRMC | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installJRMC b/installJRMC index babca74..58640d4 100755 --- a/installJRMC +++ b/installJRMC @@ -493,7 +493,7 @@ install_external_repos() { case $ID in ubuntu) - if ! grep ^deb /etc/apt/sources.list | grep -q universe; then + if ! grep ^deb /etc/apt/sources.list.d/* | grep -q universe; then echo "Adding universe repository" if ! execute sudo add-apt-repository -y universe; then err "Adding universe repository failed" @@ -839,7 +839,7 @@ install_mc_deb() { sed -i 's/ ([^)]*)//g' "control" # Remove libwebkit2gtk and their fantastic package versioning strategy - sed -i '/^Depends:/s/libwebkit2gtk[^,]*,\? *//g' "control" + sed -i 's/,\s*libwebkit2gtk[^,]*\|libwebkit2gtk[^,]*,\?//g' "control" # TODO ugly ZorinOS workaround [[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] \