Zenmap: keep data files within package

zenmap/install_scripts/macosx/zenmap.bundle

@@ -79,13 +79,16 @@
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
   </binary>
 
-  <!-- Python modules other than tnese are grabbed with get_deps.py -->
+  <!-- Python modules other than these are grabbed with get_deps.py -->
   <binary>
     ${prefix}/lib/python&PYVER;/site-packages/gi/*.so
   </binary>
   <binary>
     ${prefix}/lib/python&PYVER;/site-packages/cairo/*.so
   </binary>
+  <data>
+    ${prefix}/lib/python&PYVER;/site-packages/zenmapCore/data
+  </data>
 
 &pyreqs;
 

zenmap/pyproject.toml

@@ -26,6 +26,12 @@ zenmap = "zenmapGUI.App:run"
 [tool.setuptools]
 packages = [
 "zenmapCore",
+"zenmapCore.data.config",
+"zenmapCore.data.docs",
+"zenmapCore.data.locale",
+"zenmapCore.data.misc",
+"zenmapCore.data.pixmaps",
+"zenmapCore.data.pixmaps.radialnet",
 "zenmapGUI",
 "zenmapGUI.higwidgets",
 "radialnet",
@@ -33,16 +39,15 @@ packages = [
 "radialnet.core",
 "radialnet.gui",
 "radialnet.util",
-"share",
 ]
 
 [tool.setuptools.dynamic]
 version = {attr = "zenmapCore.Version.VERSION"}
 
 [tool.setuptools.package-data]
-"share.zenmap.pixmaps" = ["*.gif", "*.png"]
+"zenmapCore.data.pixmaps" = ["*.gif", "*.png"]
-"share.zenmap.pixmaps.radialnet" = ["*.png"]
+"zenmapCore.data.pixmaps.radialnet" = ["*.png"]
-"share.zenmap.locale" = ["*.mo"]
+"zenmapCore.data.locale" = ["*.mo"]
-"share.zenmap.config" = ["zenmap.conf", "scan_profile.usp", "zenmap_version"]
+"zenmapCore.data.config" = ["zenmap.conf", "scan_profile.usp", "zenmap_version"]
-"share.zenmap.docs" = ["*.html"]
+"zenmapCore.data.docs" = ["*.html"]
-"share.zenmap.misc" = ["*.xml"]
+"zenmapCore.data.misc" = ["*.xml"]

zenmap/zenmapCore/BasePaths.py

@@ -76,5 +76,4 @@ base_paths = dict(user_config_file=APP_NAME + '.conf',
                   target_list='target_list.txt',
                   options='options.xml',
                   user_home=HOME,
-                  db=APP_NAME + ".db",
+                  db=APP_NAME + ".db")
-                  version=APP_NAME + "_version")

zenmap/zenmapCore/Paths.py

@@ -68,38 +68,13 @@ from zenmapCore.BasePaths import base_paths
 from zenmapCore.Name import APP_NAME
 
 
-# Find out the prefix under which data files (interface definition XML,
+prefix = join(dirname(__file__), 'data')
-# pixmaps, etc.) are stored. This can vary depending on whether we are running
-# in an executable package and what type of package it is, which we check using
-# the sys.frozen attribute. See
-# http://mail.python.org/pipermail/pythonmac-sig/2004-November/012121.html.
-def get_prefix():
-    from site import getsitepackages
-    frozen = getattr(sys, "frozen", None)
-    if frozen == "macosx_app" or "Zenmap.app" in sys.executable:
-        # A py2app .app bundle.
-        return os.path.join(dirname(sys.executable), "..", "Resources")
-    elif frozen is not None:
-        # Assume a py2exe executable.
-        return dirname(sys.executable)
-    elif any(__file__.startswith(pdir) for pdir in getsitepackages()):
-        # Installed in site-packages; use configured prefix.
-        return sys.prefix
-    else:
-        # Normal script execution. Look in the current directory to allow
-        # running from the distribution.
-        return os.path.abspath(os.path.dirname(sys.argv[0]))
 
-prefix = get_prefix()
+CONFIG_DIR = join(prefix, "config")
-
+LOCALE_DIR = join(prefix, "locale")
-# These lines are overwritten by the installer to hard-code the installed
+MISC_DIR = join(prefix, "misc")
-# locations.
+PIXMAPS_DIR = join(prefix, "pixmaps")
-CONFIG_DIR = join(prefix, "share", APP_NAME, "config")
+DOCS_DIR = join(prefix, "docs")
-LOCALE_DIR = join(prefix, "share", APP_NAME, "locale")
-MISC_DIR = join(prefix, "share", APP_NAME, "misc")
-PIXMAPS_DIR = join(prefix, "share", "zenmap", "pixmaps")
-DOCS_DIR = join(prefix, "share", APP_NAME, "docs")
-NMAPDATADIR = join(prefix, "..")
 
 
 def get_extra_executable_search_paths():
@@ -125,7 +100,7 @@ class Paths(object):
 
     config_files_list = ["config_file",
                          "scan_profile",
-                         "version"]
+                         ]
 
     empty_config_files_list = ["target_list",
                                "recent_scans",
@@ -140,8 +115,16 @@ class Paths(object):
         self.pixmaps_dir = PIXMAPS_DIR
         self.misc_dir = MISC_DIR
         self.docs_dir = DOCS_DIR
-        self.nmap_dir = NMAPDATADIR
         self._delayed_incomplete = True
+        PATH = os.environ.get('PATH', os.defpath)
+        extra = get_extra_executable_search_paths()
+        if extra:
+            PATH += ';' + ';'.join(extra)
+        NMAPPATH = dirname(shutil.which("nmap", path=PATH))
+        if sys.platform == 'win32':
+            self.nmap_dir = NMAPPATH
+        else:
+            self.nmap_dir = join(NMAPPATH, "..", "share", "nmap")
 
     # Delay initializing these paths so that
     # zenmapCore.I18N.install_gettext can install _() before modules that
@@ -241,4 +224,3 @@ if __name__ == '__main__':
     print(">>> OPTIONS:", Path.options)
     print()
     print(">>> DB:", Path.db)
-    print(">>> VERSION:", Path.version)