diff --git a/dangerzone/common.py b/dangerzone/common.py index 91f79c8..8a79777 100644 --- a/dangerzone/common.py +++ b/dangerzone/common.py @@ -239,8 +239,14 @@ class Common(object): "share", ) else: - # In linux... - prefix = os.path.join(sys.prefix, "share/dangerzone") + if platform.system() == "Darwin": + # macOS + prefix = os.path.join( + os.path.dirname(os.path.dirname(sys.executable)), "Resources/share" + ) + else: + # Linux + prefix = os.path.join(sys.prefix, "share/dangerzone") resource_path = os.path.join(prefix, filename) return resource_path diff --git a/dangerzone/docker_installer.py b/dangerzone/docker_installer.py index b3463b5..709eb9a 100644 --- a/dangerzone/docker_installer.py +++ b/dangerzone/docker_installer.py @@ -123,10 +123,12 @@ class DockerInstaller(QtWidgets.QDialog): print(f"Install failed: {exception}") self.task_label.setText(f"Install failed: {exception}") self.install_t = None + self.progress.hide() self.cancel_button.setEnabled(True) def install_clicked(self): self.task_label.setText("Installing Docker") + self.progress.show() self.install_button.hide() self.cancel_button.setEnabled(False)