diff --git a/2dxutils b/2dxutils index b2a5837..54c209c 100755 --- a/2dxutils +++ b/2dxutils @@ -1,4 +1,9 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.twodxutils "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module("bemani.utils.twodxutils", run_name="__main__") diff --git a/api b/api index a0787e9..a0917b9 100755 --- a/api +++ b/api @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.api "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/arcutils b/arcutils index 2261364..a0917b9 100755 --- a/arcutils +++ b/arcutils @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.arcutils "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/bemani/utils/read.py b/bemani/utils/read.py index 6b0a4b1..1688463 100644 --- a/bemani/utils/read.py +++ b/bemani/utils/read.py @@ -1,6 +1,5 @@ -#! /usr/bin/env python3 - # vim: set fileencoding=utf-8 + import csv # type: ignore import argparse import copy diff --git a/bemanishark b/bemanishark index 6050ad1..a0917b9 100755 --- a/bemanishark +++ b/bemanishark @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.bemanishark "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/binutils b/binutils index 1cf0bab..a0917b9 100755 --- a/binutils +++ b/binutils @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.binutils "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/cardconvert b/cardconvert index 7d23969..a0917b9 100755 --- a/cardconvert +++ b/cardconvert @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.cardconvert "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/dbutils b/dbutils index 84b3e3f..a0917b9 100755 --- a/dbutils +++ b/dbutils @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.dbutils "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/frontend b/frontend index 0a91423..a0917b9 100755 --- a/frontend +++ b/frontend @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.frontend "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/ifsutils b/ifsutils index f47eb41..a0917b9 100755 --- a/ifsutils +++ b/ifsutils @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.ifsutils "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/iidxutils b/iidxutils index a5351ad..a0917b9 100755 --- a/iidxutils +++ b/iidxutils @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.iidxutils "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/proxy b/proxy index 3dba2c3..a0917b9 100755 --- a/proxy +++ b/proxy @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.proxy "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/psmap b/psmap index ccafd9e..a0917b9 100755 --- a/psmap +++ b/psmap @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.psmap "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/read b/read index c5b5a4c..a0917b9 100755 --- a/read +++ b/read @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.read "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/replay b/replay index ad252f5..a0917b9 100755 --- a/replay +++ b/replay @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.replay "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/responsegen b/responsegen index dd96d2a..a0917b9 100755 --- a/responsegen +++ b/responsegen @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.responsegen "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/scheduler b/scheduler index b4401d7..a0917b9 100755 --- a/scheduler +++ b/scheduler @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.scheduler "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/services b/services index eae92cd..a0917b9 100755 --- a/services +++ b/services @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.services "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/shell b/shell index 9c7d11d..3554a1e 100755 --- a/shell +++ b/shell @@ -1,4 +1,9 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 +import sys +sys.path.append(path) + +import code +code.InteractiveConsole().interact() diff --git a/struct b/struct index fdb7574..a0917b9 100755 --- a/struct +++ b/struct @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.struct "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/trafficgen b/trafficgen index b99c4f6..a0917b9 100755 --- a/trafficgen +++ b/trafficgen @@ -1,4 +1,10 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) +name = os.path.basename(__file__) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m bemani.utils.trafficgen "$@" +import sys +sys.path.append(path) + +import runpy +runpy.run_module(f"bemani.utils.{name}", run_name="__main__") diff --git a/verifylibs b/verifylibs index 83e943e..28164a0 100755 --- a/verifylibs +++ b/verifylibs @@ -1,4 +1,16 @@ -#! /bin/bash +#! /usr/bin/env python3 +import os +path = os.path.abspath(os.path.dirname(__file__)) -export PYTHONPATH=$(python -c "import os; print(os.path.realpath('.'))") -python3 -m unittest discover -s bemani/tests "$@" +import sys +sys.path.append(path) +sys.argv = [ + sys.argv[0], + "discover", + "-s", + os.path.join(path, "bemani/tests"), + *sys.argv[1:], +] + +import runpy +runpy.run_module("unittest", run_name="__main__")