epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a hard requirement on the cert-sync utility.

Browse Source 
This tool is required to sync the certificates
used for https queries. This also has a side-effect
of prompting the mono-complete package on Mint,
which pulls in other required but missing packages.
This commit is contained in:
Paul Chote
2018-08-10 19:10:14 +01:00
parent 20dbf76e81
commit e56cb9901b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/linux/AppRun.in
View File

@@ -4,7 +4,7 @@
MINIMUM_MONO_VERSION="4.2" MINIMUM_MONO_VERSION="4.2"
prompt_apt_install_mono_complete() { prompt_apt_install_mono_complete() {
command -v mono >/dev/null 2>&1 && return 1 command -v mono >/dev/null 2>&1 && command -v cert-sync >/dev/null 2>&1 && return 1
command -v apt-cache > /dev/null || return 1 command -v apt-cache > /dev/null || return 1
command -v xdg-mime > /dev/null || return 1 command -v xdg-mime > /dev/null || return 1
command -v xdg-open > /dev/null || return 1 command -v xdg-open > /dev/null || return 1
@@ -19,6 +19,7 @@ make_version() {
mono_missing_or_old() { mono_missing_or_old() {
command -v mono >/dev/null 2>&1 || return 0 command -v mono >/dev/null 2>&1 || return 0
command -v cert-sync >/dev/null 2>&1 || return 0
MONO_VERSION=$(mono --version | head -n1 | cut -d' ' -f5) MONO_VERSION=$(mono --version | head -n1 | cut -d' ' -f5)
[ "$(make_version "${MONO_VERSION}")" -lt "$(make_version "${MINIMUM_MONO_VERSION}")" ] && return 0 [ "$(make_version "${MONO_VERSION}")" -lt "$(make_version "${MINIMUM_MONO_VERSION}")" ] && return 0
return 1 return 1
@@ -43,7 +44,7 @@ if prompt_apt_install_mono_complete; then
fi fi
if mono_missing_or_old; then if mono_missing_or_old; then
ERROR_MESSAGE="{MODNAME} requires Mono ${MINIMUM_MONO_VERSION} or greater.\nPlease install Mono using your system package manager.\n\nSee http://wiki.openra.net/AppImages for more information." ERROR_MESSAGE="{MODNAME} requires Mono ${MINIMUM_MONO_VERSION} or greater and the cert-sync utility.\nPlease install Mono using your system package manager.\n\nSee http://wiki.openra.net/AppImages for more information."
if command -v zenity > /dev/null; then if command -v zenity > /dev/null; then
zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
elif command -v kdialog > /dev/null; then elif command -v kdialog > /dev/null; then