diff --git a/setup.py b/setup.py index f592b0452f7f720c345edf17bca7605ed1d87037..04faa9ea6722ec2a48e3013a6c58e79fccbcff33 100644 --- a/setup.py +++ b/setup.py @@ -61,11 +61,18 @@ else: for f in onlyfiles: zipincludes.append((os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f))) - # Check if we are in Conda env - if 'CONDA_ENV_PATH' in os.environ: - libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib", - "libsodium.so.13") - includefiles.append((libsodium_path, "libsodium.so.13")) +if sys.platform == "darwin": + info = subprocess.check_output(["brew", "info", "libsodium"]) + info = info.decode().splitlines(keepends=False) + if len(info) > 1: + library_path = info[3].split(" ")[0] + libsodium_path = os.path.join(library_path, "lib", + "libsodium.dylib") + includefiles.append(libsodium_path) + print(libsodium_path) + else: + print("Erreur : libsodium not found. Please install it with brew install libsodium.") + print("Includes : ") diff --git a/src/sakia/gui/import_account.py b/src/sakia/gui/import_account.py index 0a453fc05caae61dc1bbef5322981f3c4976fadf..a7ee0dbb1368d95aaa07f5ff506d4999a21b43a5 100644 --- a/src/sakia/gui/import_account.py +++ b/src/sakia/gui/import_account.py @@ -24,6 +24,7 @@ class ImportAccountDialog(QDialog, Ui_ImportAccountDialog): self.setupUi(self) self.app = app self.main_window = parent + self.selected_file = "" self.button_box.button(QDialogButtonBox.Ok).setEnabled(False) def accept(self):