cleaner handling of python-common in resources

python -> common/python to avoid spurious files, and better naming in
scala resources, minor fixes

python/nomadscripts/calculate_meta_info_overrides.py → common/python/nomadscripts/calculate_meta_info_overrides.py

@@ -216,8 +216,8 @@ def buildOverrides(oldValues, newValues):
 
 
 if __name__ == "__main__":
-    overridesDir = os.path.normpath(os.path.join(basePath,"../nomad_meta_info_overrides"))
-    defaultPath = os.path.normpath(os.path.join(basePath,"../nomad_meta_info"))
+    overridesDir = os.path.normpath(os.path.join(basePath,"../../../nomad-meta-info/meta_info/nomad_meta_info_overrides"))
+    defaultPath = os.path.normpath(os.path.join(basePath,"../../../nomad-meta-info/meta_info/nomad_meta_info"))
     usage = """usage: {command} [--check-only] [--old-ref <ref1=HEAD>] [--old-path <path=None>] [--help]
     [--new-ref <ref2=None>] [--new-path <path=basePath>] [--repo-path <repoPath=None>]
     [--overrides-dir <overridesDir>] [--no-clobber] [--verbose] [<basePath>]

python/nomadscripts/normalize_meta_info.py → common/python/nomadscripts/normalize_meta_info.py

@@ -184,7 +184,7 @@ def normalizePaths(paths, checkOnly, force, addGid, addSubGids, extraArgsHandlin
     return {"paths": paths, "hasErrors": hasErrors, "hasChanges": hasChanges}
 
 if __name__ == "__main__":
-    defaultDir = os.path.normpath(os.path.join(basePath, "../../nomad-meta-info/meta_info/nomad_meta_info"))
+    defaultDir = os.path.normpath(os.path.join(basePath, "../../../nomad-meta-info/meta_info/nomad_meta_info"))
     usage = """usage: {command} [--check-only] [--force] [--add-gid] [--add-sub-gids] [--keep-extra-args] [--remove-extra-args] [--error-if-extra-args] [file/or/dir ...]
 
     normalizes the InfoKinds file/or/dir (that defalts to {dir})