Launch poezio as a module package.

This commit is contained in:
Emmanuel Gil Peyrot 2016-06-27 23:54:37 +01:00
parent 0447188eac
commit 7e51947f47
4 changed files with 12 additions and 13 deletions

View file

@ -1,20 +1,20 @@
#!/bin/sh #!/bin/sh
poezio_dir=$(dirname "$0") cd $(dirname "$0")
if [ -z "$POEZIO_VENV" ] if [ -z "$POEZIO_VENV" ]
then then
POEZIO_VENV="poezio-venv" POEZIO_VENV="poezio-venv"
fi fi
if [ -d "$poezio_dir/.git" ] if [ -d .git ]
then then
args=$(git --git-dir="$poezio_dir/.git" show --format='%h %ci' | head -n1) args=$(git show --format='%h %ci' | head -n1)
else else
args="0.9-dev" args="0.9-dev"
fi fi
if [ -e "$poezio_dir/$POEZIO_VENV" ] if [ -e "$POEZIO_VENV" ]
then then
PYTHON3="$poezio_dir/$POEZIO_VENV/bin/python3" PYTHON3="$POEZIO_VENV/bin/python3"
else else
echo "" echo ""
echo "WARNING: Not using the up-to-date launch format" echo "WARNING: Not using the up-to-date launch format"
@ -25,5 +25,5 @@ else
fi fi
$PYTHON3 -c 'import sys;(print("Python 3.4 or newer is required") and exit(1)) if sys.version_info < (3, 4) else exit(0)' || exit 1 $PYTHON3 -c 'import sys;(print("Python 3.4 or newer is required") and exit(1)) if sys.version_info < (3, 4) else exit(0)' || exit 1
exec "$PYTHON3" "$poezio_dir/poezio/poezio.py" -v "$args" "$@" exec "$PYTHON3" -m poezio -v "$args" "$@"

View file

@ -1 +0,0 @@
from poezio.poezio import main

6
poezio/__main__.py Normal file
View file

@ -0,0 +1,6 @@
from poezio.poezio import test_curses, main
if test_curses():
main()
else:
sys.exit(1)

View file

@ -107,9 +107,3 @@ def main():
cocore.reset_curses() cocore.reset_curses()
except: except:
pass pass
if __name__ == '__main__':
if test_curses():
main()
else:
sys.exit(1)