From 35ea499857fe2b5eddcc7314a34106ba293840f3 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Tue, 20 Jun 2017 11:49:11 -0400 Subject: [PATCH] Make docs installation optional --- Makefile | 8 ++++++-- qt/app.py | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1d5a16c3..1d4f0dba 100644 --- a/Makefile +++ b/Makefile @@ -81,9 +81,9 @@ normpo : srcpkg : ./scripts/srcpkg.sh -install: build/help | all pyc +install: all pyc mkdir -p ${DESTDIR}${PREFIX}/share/dupeguru - cp -rf ${packages} locale build/help ${DESTDIR}${PREFIX}/share/dupeguru + cp -rf ${packages} locale ${DESTDIR}${PREFIX}/share/dupeguru cp -f run.py ${DESTDIR}${PREFIX}/share/dupeguru/run.py chmod 755 ${DESTDIR}${PREFIX}/share/dupeguru/run.py mkdir -p ${DESTDIR}${PREFIX}/bin @@ -93,6 +93,10 @@ install: build/help | all pyc mkdir -p ${DESTDIR}${PREFIX}/share/pixmaps cp -f images/dgse_logo_128.png ${DESTDIR}${PREFIX}/share/pixmaps/dupeguru.png +installdocs: build/help + mkdir -p ${DESTDIR}${PREFIX}/share/dupeguru + cp -rf build/help ${DESTDIR}${PREFIX}/share/dupeguru + uninstall : rm -rf "${DESTDIR}${PREFIX}/share/dupeguru" rm -f "${DESTDIR}${PREFIX}/bin/dupeguru" diff --git a/qt/app.py b/qt/app.py index 93d45de9..cc3077f8 100644 --- a/qt/app.py +++ b/qt/app.py @@ -209,7 +209,11 @@ class DupeGuru(QObject): def showHelpTriggered(self): base_path = platform.HELP_PATH - url = QUrl.fromLocalFile(op.abspath(op.join(base_path, 'index.html'))) + help_path = op.abspath(op.join(base_path, 'index.html')) + if op.exists(help_path): + url = QUrl.fromLocalFile(help_path) + else: + url = QUrl('https://www.hardcoded.net/dupeguru/help/en/') QDesktopServices.openUrl(url) #--- model --> view