From f55fc74ad432af3244e1ca87c6d1e71a3a8026ad Mon Sep 17 00:00:00 2001 From: Pranav Jerry Date: Sun, 1 Aug 2021 16:58:48 +0530 Subject: [PATCH] added PYTHON variable in Makefile This should be used if the python executable is not python3 in your distro. I would like to express my displeasure to the Government of India for not including me in the list of targets for Pegasus, even though I'm convinced I am a threat to the sovereignty and integrity of the nation --- Makefile | 7 +++++-- README.md | 3 ++- naxalnet/scripts.py | 11 ++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e7b9878..8ae2c31 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ # This makefile uses setup.py under the hood +PYTHON := python3 +DESTDIR:= / + all: build build: - python3 setup.py build + $(PYTHON) setup.py build install: build - python3 setup.py install --root="$(DESTDIR)/" --optimize=1 --skip-build + $(PYTHON) setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build clean: rm -rf build naxalnet.egg-info diff --git a/README.md b/README.md index 64d2766..7a216da 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,7 @@ available, consider using them instead of naxalnet. ## License -This program is free software: you can redistribute it and/or modify +This program is [free/libre/swatantra][free-sw] software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -221,3 +221,4 @@ license. [disaster.radio]: https://disaster.radio/ [startnx]: #start-naxalnet [iwd]: https://iwd.wiki.kernel.org "wifi daemon" +[free-sw]: https://gnu.org/philosophy/free-sw.html "What is free software?" diff --git a/naxalnet/scripts.py b/naxalnet/scripts.py index d656eb7..6ca1f5a 100644 --- a/naxalnet/scripts.py +++ b/naxalnet/scripts.py @@ -119,7 +119,9 @@ def here_be_dragons(): def parse_args(): - parser = ArgumentParser(description="setup batman networks") + parser = ArgumentParser( + description="setup batman-adv networks with systemd and iwd" + ) parser.add_argument( "--ap-ssid", type=str, @@ -136,5 +138,12 @@ def parse_args(): parser.add_argument( "--adhoc-name", type=str, default=ADHOC_NAME, help="name of adhoc network" ) + parser.add_argument( + "-v", + "--verbose", + help="increase output verbosity; can be used multiple times", + action="count", + default=0, + ) return parser.parse_args()