Compare commits
2 Commits
dfd013011c
...
05c3a375cc
| Author | SHA1 | Date | |
|---|---|---|---|
| 05c3a375cc | |||
| 175d62fce3 |
@@ -948,14 +948,14 @@ install_mc_deb() {
|
|||||||
execute ar x "$MC_DEB"
|
execute ar x "$MC_DEB"
|
||||||
execute tar xJf "control.tar.xz"
|
execute tar xJf "control.tar.xz"
|
||||||
# Remove minimum version specifiers from control file
|
# 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
|
# 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
|
# TODO workaround for legacy ZorinOS
|
||||||
[[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] &&
|
[[ $ID == "ubuntu" && ${VERSION_ID%.*} -le 16 ]] &&
|
||||||
grep -q zorin /etc/os-release &&
|
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"
|
execute tar -cJf "control.tar.xz" "control" "postinst"
|
||||||
declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}"
|
declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}"
|
||||||
@@ -972,7 +972,6 @@ install_mc_deb() {
|
|||||||
--reinstall \
|
--reinstall \
|
||||||
"$MC_DEB"; then
|
"$MC_DEB"; then
|
||||||
err "Local MC DEB installation failed"
|
err "Local MC DEB installation failed"
|
||||||
err "Only the default MC repo can be used for --install=local"
|
|
||||||
if ask_ok "Remove source DEB and retry"; then
|
if ask_ok "Remove source DEB and retry"; then
|
||||||
execute rm -f "$MC_DEB"
|
execute rm -f "$MC_DEB"
|
||||||
exec "$SCRIPT_PATH" "$@" "--no-update"
|
exec "$SCRIPT_PATH" "$@" "--no-update"
|
||||||
|
|||||||
Reference in New Issue
Block a user