From 7e1dc410b041d5b9b34d24fa5342f56cabf9266b Mon Sep 17 00:00:00 2001
From: Patrick Lipka <patrick.lipka@emea.nec.com>
Date: Fri, 30 Sep 2022 15:56:20 +0200
Subject: [PATCH] v1.0 - cleanup

---
 lib/dependency.py |  8 +++-----
 lib/io.py         |  3 ++-
 libinstaller      | 27 +--------------------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/lib/dependency.py b/lib/dependency.py
index eaff6f6..c1cdc49 100644
--- a/lib/dependency.py
+++ b/lib/dependency.py
@@ -59,7 +59,7 @@ def load_dependencies(library, selected_libs, config_dir):
     lib_names = []
     for lib in selected_libs:
         lib_names.append(lib['name'])
-    
+
     dependencies = library['dependencies'].split(',')
     for dep in dependencies:
         if len(dep) > 1:
@@ -79,8 +79,6 @@ def load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore
     if install_all_libs:
         for config_file in glob.glob(config_dir+"/*.json"):
             data = load_lib_data(config_file)
-            #with open(cf, 'r') as f:
-                #data = json.load(f)
             data['version'] = data['default version']
             selected_libs.append(data)
     else:
@@ -95,10 +93,10 @@ def load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore
                     data = load_lib_data(config_file)
                     data['version'] = version
                     selected_libs.append(data)
-    
+
     if not ignore_deps:
         # also add all dependencies to the install list
         for lib in selected_libs:
             load_dependencies(lib, selected_libs, config_dir)
-    
+
     return selected_libs
diff --git a/lib/io.py b/lib/io.py
index 01b9af9..44a0b85 100644
--- a/lib/io.py
+++ b/lib/io.py
@@ -1,7 +1,8 @@
 import json
 
+
 # load library data from json file
 def load_lib_data(lib_path):
     with open (lib_path, 'r') as config_file:
         data = json.load(config_file)
-        return data
\ No newline at end of file
+        return data
diff --git a/libinstaller b/libinstaller
index 1da4a44..403b1bb 100755
--- a/libinstaller
+++ b/libinstaller
@@ -8,7 +8,7 @@ from lib.dependency import sort_libs_by_dependencies, load_selected_libs
 from lib.installer import install_lib
 from lib.init import init, check_python_version
 
-SCRIPT_VERSION = "v0.9"
+SCRIPT_VERSION = "v1.0"
 
 # check if Python >=3.3.0 is used
 check_python_version()
@@ -33,31 +33,6 @@ ignore_deps = arg_namespace.ignore_deps
 
 # extract libraries and versions selected for installation
 selected_libs = load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore_deps)
-'''
-selected_libs = []
-if install_all_libs:
-    for config_file in glob.glob(config_dir+"/*.json"):
-        data = load_lib_data(config_file)
-        #with open(cf, 'r') as f:
-            #data = json.load(f)
-        data['version'] = data['default version']
-        selected_libs.append(data)
-else:
-    ignore_names = ["config", "mpi", "compiler", "prefix", "src", "work", "keep_work", "threads", "verbose", "version", "disable_shared"]
-    for lib_name in args:
-        if lib_name not in ignore_names and "version" not in lib_name:
-            install = getattr(arg_namespace, lib_name)
-            if install:
-                version = getattr(arg_namespace, lib_name+"_version")
-                config_file = config_dir + "/" + lib_name + ".json"
-                data = load_lib_data(config_file)
-                data['version'] = data['default version']
-                selected_libs.append(data)
-                #with open(config_file, 'r') as cf:
-                    #data = json.load(cf)
-                    #data['version'] = version
-                    #selected_libs.append(data)
-'''
 
 # set up install directory name
 compiler_version = get_compiler_version(compiler)