From a9ef098d3291860f48ce27e075b6957c1121f039 Mon Sep 17 00:00:00 2001 From: SecurityWaffle Date: Sun, 6 Oct 2019 13:32:17 -0500 Subject: [PATCH 1/3] Fixed bug with defaults.yml path --- bin/pwnagotchi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pwnagotchi b/bin/pwnagotchi index 4733105..9b0b561 100755 --- a/bin/pwnagotchi +++ b/bin/pwnagotchi @@ -16,7 +16,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument('-C', '--config', action='store', dest='config', - default=os.path.join(os.path.abspath(os.path.dirname(pwnagotchi.__file__)), '/defaults.yml'), + default=os.path.join(os.path.abspath(os.path.dirname(pwnagotchi.__file__)), 'defaults.yml'), help='Main configuration file.') parser.add_argument('-U', '--user-config', action='store', dest='user_config', default='/etc/pwnagotchi/config.yml', help='If this file exists, configuration will be merged and this will override default values.') From 1cf45138b8c8793cd7e1dbc8b8e0962a5ab5214a Mon Sep 17 00:00:00 2001 From: SecurityWaffle Date: Sun, 6 Oct 2019 13:40:16 -0500 Subject: [PATCH 2/3] Fixes path to defaults.yml --- bin/pwnagotchi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pwnagotchi b/bin/pwnagotchi index 9b0b561..56300af 100755 --- a/bin/pwnagotchi +++ b/bin/pwnagotchi @@ -16,7 +16,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument('-C', '--config', action='store', dest='config', - default=os.path.join(os.path.abspath(os.path.dirname(pwnagotchi.__file__)), 'defaults.yml'), + default=os.path.join(os.path.dirname(pwnagotchi.__file__), 'defaults.yml'), help='Main configuration file.') parser.add_argument('-U', '--user-config', action='store', dest='user_config', default='/etc/pwnagotchi/config.yml', help='If this file exists, configuration will be merged and this will override default values.') From a3052c3b990558db9d3c60c5ed55fa1de72efc02 Mon Sep 17 00:00:00 2001 From: SecurityWaffle Date: Sun, 6 Oct 2019 13:41:55 -0500 Subject: [PATCH 3/3] fixes issue where defaults.yml is not included in the install --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 41d7475..98ee45c 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,8 @@ setup(name='pwnagotchi', license='GPL', install_requires=required, scripts=['bin/pwnagotchi'], - package_data={'pwnagotchi': ('pwnagotchi/defaults.yml',)}, + package_data={'pwnagotchi': ['defaults.yml', 'pwnagotchi/defaults.yml']}, + include_package_data=True, packages=find_packages(), classifiers=[ 'Programming Language :: Python :: 3',