bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix libwebkit removal regex

Browse Source
This commit is contained in:
Bryan Roessler
2024-10-21 23:18:45 -04:00
parent 6fdbba996e
commit 5005ca736f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installJRMC
View File

@@ -493,7 +493,7 @@ install_external_repos() {
case $ID in case $ID in
ubuntu) 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" echo "Adding universe repository"
if ! execute sudo add-apt-repository -y universe; then if ! execute sudo add-apt-repository -y universe; then
err "Adding universe repository failed" err "Adding universe repository failed"
@@ -839,7 +839,7 @@ install_mc_deb() {
sed -i 's/ ([^)]*)//g' "control" sed -i 's/ ([^)]*)//g' "control"
# Remove libwebkit2gtk and their fantastic package versioning strategy # 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 # TODO ugly ZorinOS workaround
[[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] \ [[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] \