X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=vinstall.py;h=afbb0e34685448718b14ad02792cc154a4773285;hb=e4f642e20348dab3523316157dafdd609fa32455;hp=e71c9530c0310ba343f49b0b0805b9675250f2cf;hpb=a87663bced4a8aba44ca7b675c2c12d1b358b56f;p=mpd-sima.git diff --git a/vinstall.py b/vinstall.py index e71c953..afbb0e3 100755 --- a/vinstall.py +++ b/vinstall.py @@ -1,10 +1,9 @@ #!/usr/bin/env python3 # Copyright (C) 2013 Vinay Sajip. New BSD License. -# Copyright (C) 2014, 2020 kaliko +# Copyright (C) 2014, 2021 kaliko # -from __future__ import print_function -REQ_VER = (3,4) +REQ_VER = (3,6) import sys if sys.version_info < REQ_VER: print('Need at least python {0}.{1} to run this script'.format(*REQ_VER), file=sys.stderr) @@ -92,7 +91,7 @@ class ExtendedEnvBuilder(venv.EnvBuilder): os.unlink(distpath) -def main(args=None): +def main(): root = os.path.dirname(os.path.abspath(__file__)) vdir = os.path.join(root, 'venv') builder = ExtendedEnvBuilder(clear=True, verbose=False, with_pip=True) @@ -104,8 +103,8 @@ def main(args=None): # Write wrapper with open(os.path.join(root, 'vmpd-sima'),'w') as fd: fd.write('#!/bin/sh\n') - fd.write('. "{}/venv/bin/activate"\n'.format(root)) - fd.write('"{}/venv/bin/mpd-sima" "$@"'.format(root)) + fd.write(f'. "{root}/venv/bin/activate"\n') + fd.write(f'"{root}/venv/bin/mpd-sima" "$@"') os.chmod(os.path.join(root, 'vmpd-sima'), 0o744) @@ -115,5 +114,5 @@ if __name__ == '__main__': main() rc = 0 except ImportError as e: - print('Error: %s' % e) + print(f'Error: {e}') sys.exit(rc)