From 1ff472af05e7b2ca70efe75c556deb0414a90aab Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Tue, 2 Oct 2018 12:36:32 +0200 Subject: [PATCH] Removing display check for macOS. --- app/src/qt/mindforger.cpp | 5 ++++- build/debian/debian-aptly-add-deb.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/qt/mindforger.cpp b/app/src/qt/mindforger.cpp index eaf9129c..51b952a5 100644 --- a/app/src/qt/mindforger.cpp +++ b/app/src/qt/mindforger.cpp @@ -105,12 +105,15 @@ using namespace std; int main(int argc, char *argv[]) { // check whether running in GUI (and not in text console tty) +#ifndef __APPLE__ char *term = getenv(m8r::ENV_VAR_DISPLAY); if(!term || !strlen(term)) { - cerr << endl << QCoreApplication::translate("main", "MindForger CANNOT be run from text console - run it from a terminal in GUI.").toUtf8().constData() + cerr << endl << QCoreApplication::translate("main", "MindForger CANNOT be run from text console - set DISPLAY environment variable or run MindForger from GUI.").toUtf8().constData() << endl; exit(1); } + // default terminal macOS environment: TERM=xterm-256color DISPLAY= +#endif // stupid & ugly reused code as macOS requires to pass --disable-web-security parameter to QApplication // so that it allows loading of images by QWebEngine diff --git a/build/debian/debian-aptly-add-deb.sh b/build/debian/debian-aptly-add-deb.sh index a041a335..03fe8095 100755 --- a/build/debian/debian-aptly-add-deb.sh +++ b/build/debian/debian-aptly-add-deb.sh @@ -38,7 +38,7 @@ echo "See 'MindForger Release Guide#Debian and my PPA' notebook for detailed ste #aptly snapshot list # delete snapshot(s) ONLY if needed - publish must be deleted first! -#aptly snapshot drop mf-test-snapshot +#aptly snapshot drop mindforger-1.46.0-snapshot # create snapshot in the time of release - note release NAME #aptly snapshot create mindforger-1.47.0-snapshot from repo mindforger-com-ppa