Modernize scripts in bin/ (not done!)

Not all scripts have a sufficiently pure main()-function.
Uninett · Sep 8, 2023 · 1a68111 · 1a68111
1 parent 99fcbe8
commit 1a68111
Show file tree

Hide file tree

Showing 36 changed files with 36 additions and 0 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,6 +24,42 @@ dependencies = [
 [project.urls]
 Homepage = "https://nav.uninett.no/"
 
+[project.scripts]
+alertengine = "nav.bin.alertengine:main"
+autoenable = "nav.bin.autoenable:main"
+collect_active_ip = "nav.bin.collect_active_ip:main"
+emailreports = "nav.bin.emailreports:main"
+eventengine = "nav.bin.eventengine:main"
+ipdevpolld = "nav.bin.ipdevpolld:main"
+logengine = "nav.bin.logengine:main"
+macwatch = "nav.bin.macwatch:main"
+mailin = "nav.bin.mailin:main"
+maintengine = "nav.bin.maintengine:main"
+nav = "nav.bin.nav:main"
+navcheckservice = "nav.bin.navcheckservice:main"
+navclean = "nav.bin.navclean:main"
+navdf = "nav.bin.navdf:main"
+navdump = "nav.bin.navdump:main"
+naventity = "nav.bin.naventity:main"
+navoidverify = "nav.bin.navoidverify:main"
+navpgdump = "nav.bin.navpgdump:main"
+navsnmp = "nav.bin.navsnmp:main"
+navstats = "nav.bin.navstats:main"
+navsyncdb = "nav.bin.navsyncdb:main"
+navsynctypes = "nav.bin.navsynctypes:main"
+navtopology = "nav.bin.navtopology:main"
+navuser = "nav.bin.navuser:main"
+netbiostracker = "nav.bin.netbiostracker:main"
+pping = "nav.bin.pping:main"
+radiusparser = "nav.bin.radiusparser:main"
+servicemon = "nav.bin.servicemon:main"
+smsd = "nav.bin.smsd:main"
+snmptrapd = "nav.bin.snmptrapd:main"
+sortedstats_cacher = "nav.bin.sortedstats_cacher:main"
+start_arnold = "nav.bin.start_arnold:main"
+t1000 = "nav.bin.t1000:main"
+thresholdmon = "nav.bin.thresholdmon:main"
+
 [tool.setuptools]
 include-package-data = true
 zip-safe = false

diff --git a/python/nav/bin/__init__.py b/python/nav/bin/__init__.py
diff --git a/bin/alertengine.py → python/nav/bin/alertengine.py b/bin/alertengine.py → python/nav/bin/alertengine.py
diff --git a/bin/autoenable.py → python/nav/bin/autoenable.py b/bin/autoenable.py → python/nav/bin/autoenable.py
diff --git a/bin/collect_active_ip.py → python/nav/bin/collect_active_ip.py b/bin/collect_active_ip.py → python/nav/bin/collect_active_ip.py
diff --git a/bin/emailreports.py → python/nav/bin/emailreports.py b/bin/emailreports.py → python/nav/bin/emailreports.py
diff --git a/bin/eventengine → python/nav/bin/eventengine.py b/bin/eventengine → python/nav/bin/eventengine.py
diff --git a/bin/ipdevpolld → python/nav/bin/ipdevpolld.py b/bin/ipdevpolld → python/nav/bin/ipdevpolld.py
diff --git a/bin/logengine.py → python/nav/bin/logengine.py b/bin/logengine.py → python/nav/bin/logengine.py
diff --git a/bin/macwatch.py → python/nav/bin/macwatch.py b/bin/macwatch.py → python/nav/bin/macwatch.py
diff --git a/bin/mailin.py → python/nav/bin/mailin.py b/bin/mailin.py → python/nav/bin/mailin.py
diff --git a/bin/maintengine.py → python/nav/bin/maintengine.py b/bin/maintengine.py → python/nav/bin/maintengine.py
diff --git a/bin/nav → python/nav/bin/nav.py b/bin/nav → python/nav/bin/nav.py
diff --git a/bin/navcheckservice → python/nav/bin/navcheckservice.py b/bin/navcheckservice → python/nav/bin/navcheckservice.py
diff --git a/bin/navclean → python/nav/bin/navclean.py b/bin/navclean → python/nav/bin/navclean.py
diff --git a/bin/navdf → python/nav/bin/navdf.py b/bin/navdf → python/nav/bin/navdf.py
diff --git a/bin/navdump → python/nav/bin/navdump.py b/bin/navdump → python/nav/bin/navdump.py
diff --git a/bin/naventity → python/nav/bin/naventity.py b/bin/naventity → python/nav/bin/naventity.py
diff --git a/bin/navoidverify → python/nav/bin/navoidverify.py b/bin/navoidverify → python/nav/bin/navoidverify.py
diff --git a/bin/navpgdump → python/nav/bin/navpgdump.py b/bin/navpgdump → python/nav/bin/navpgdump.py
diff --git a/bin/navsnmp → python/nav/bin/navsnmp.py b/bin/navsnmp → python/nav/bin/navsnmp.py
diff --git a/bin/navstats → python/nav/bin/navstats.py b/bin/navstats → python/nav/bin/navstats.py
diff --git a/bin/navsyncdb → python/nav/bin/navsyncdb.py b/bin/navsyncdb → python/nav/bin/navsyncdb.py
diff --git a/bin/navsynctypes → python/nav/bin/navsynctypes.py b/bin/navsynctypes → python/nav/bin/navsynctypes.py
diff --git a/bin/navtopology → python/nav/bin/navtopology.py b/bin/navtopology → python/nav/bin/navtopology.py
diff --git a/bin/navuser → python/nav/bin/navuser.py b/bin/navuser → python/nav/bin/navuser.py
diff --git a/bin/netbiostracker.py → python/nav/bin/netbiostracker.py b/bin/netbiostracker.py → python/nav/bin/netbiostracker.py
diff --git a/bin/pping.py → python/nav/bin/pping.py b/bin/pping.py → python/nav/bin/pping.py
diff --git a/bin/radiusparser.py → python/nav/bin/radiusparser.py b/bin/radiusparser.py → python/nav/bin/radiusparser.py
diff --git a/bin/servicemon.py → python/nav/bin/servicemon.py b/bin/servicemon.py → python/nav/bin/servicemon.py
diff --git a/bin/smsd.py → python/nav/bin/smsd.py b/bin/smsd.py → python/nav/bin/smsd.py
diff --git a/bin/snmptrapd.py → python/nav/bin/snmptrapd.py b/bin/snmptrapd.py → python/nav/bin/snmptrapd.py
diff --git a/bin/sortedstats_cacher.py → python/nav/bin/sortedstats_cacher.py b/bin/sortedstats_cacher.py → python/nav/bin/sortedstats_cacher.py
diff --git a/bin/start_arnold.py → python/nav/bin/start_arnold.py b/bin/start_arnold.py → python/nav/bin/start_arnold.py
diff --git a/bin/t1000.py → python/nav/bin/t1000.py b/bin/t1000.py → python/nav/bin/t1000.py
diff --git a/bin/thresholdmon → python/nav/bin/thresholdmon.py b/bin/thresholdmon → python/nav/bin/thresholdmon.py