From 2cffe792d8070f37345056e8c88379aa8a2774fd Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Tue, 27 Sep 2022 12:08:23 +0200
Subject: Version: Ensure that we load a specific one

---
 wrappers/python/eduvpn_common/__init__.py | 1 +
 wrappers/python/eduvpn_common/loader.py   | 5 +++--
 wrappers/python/eduvpn_common/main.py     | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'wrappers/python/eduvpn_common')

diff --git a/wrappers/python/eduvpn_common/__init__.py b/wrappers/python/eduvpn_common/__init__.py
index e69de29..3dc1f76 100644
--- a/wrappers/python/eduvpn_common/__init__.py
+++ b/wrappers/python/eduvpn_common/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.1.0"
diff --git a/wrappers/python/eduvpn_common/loader.py b/wrappers/python/eduvpn_common/loader.py
index bce2638..99f5eb6 100644
--- a/wrappers/python/eduvpn_common/loader.py
+++ b/wrappers/python/eduvpn_common/loader.py
@@ -2,10 +2,11 @@ from ctypes import *
 from collections import defaultdict
 import pathlib
 import platform
+from eduvpn_common import __version__
 from eduvpn_common.types import *
 
 
-def load_lib(version: str):
+def load_lib():
     lib_prefixes = defaultdict(
         lambda: "lib",
         {
@@ -24,7 +25,7 @@ def load_lib(version: str):
     os = platform.system().lower()
 
     libname = "eduvpn_common"
-    libfile = f"{lib_prefixes[os]}{libname}{lib_suffixes[os]}"
+    libfile = f"{lib_prefixes[os]}{libname}-{__version__}{lib_suffixes[os]}"
 
     lib = None
 
diff --git a/wrappers/python/eduvpn_common/main.py b/wrappers/python/eduvpn_common/main.py
index 1b18fb0..7cb4b5e 100644
--- a/wrappers/python/eduvpn_common/main.py
+++ b/wrappers/python/eduvpn_common/main.py
@@ -9,8 +9,6 @@ from eduvpn_common.state import State, StateType
 
 eduvpn_objects = {}
 
-VERSION = "0.1.0"
-
 
 def add_as_global_object(eduvpn) -> bool:
     global eduvpn_objects
@@ -39,7 +37,7 @@ class EduVPN(object):
         self.config_directory = config_directory
 
         # Load the library
-        self.lib = load_lib(VERSION)
+        self.lib = load_lib()
         initialize_functions(self.lib)
 
         self.event_handler = EventHandler(self.lib)
-- 
cgit v1.2.3