Selaa lähdekoodia

Improve --compat for debs

bryan 4 päivää sitten
vanhempi
commit
05c3a375cc
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3 3
      installJRMC

+ 3 - 3
installJRMC

@@ -948,14 +948,14 @@ install_mc_deb() {
     execute ar x "$MC_DEB"
     execute tar xJf "control.tar.xz"
     # Remove minimum version specifiers from control file
-    sed -i 's/ ([^)]*)//g' "control"
+    execute sed -i 's/ ([^)]*)//g' control
     # Remove libwebkit2gtk and their fantastic package versioning strategy
-    sed -i 's/,\s*libwebkit2gtk[^,]*,\?|libwebkit2gtk[^,]*,\?//g' "control"
+    execute sed -E -i 's/,[[:space:]]*libwebkit2gtk[^,]*(,|\?)?//g' control
 
     # TODO workaround for legacy ZorinOS
     [[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] &&
     grep -q zorin /etc/os-release &&
-    sed -i 's/libva2/libva1/g' "control"
+    execute sed -i 's/libva2/libva1/g' control
 
     execute tar -cJf "control.tar.xz" "control" "postinst"
     declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}"