scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from SecurityWaffle/master

Browse Source 
Fixes defaults.yml bugs listed in
This commit is contained in:
evilsocket 2019-10-06 21:23:48 +02:00 committed by GitHub
commit ff6b4f6a52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

2
bin/pwnagotchi

@ -16,7 +16,7 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-C', '--config', action='store', dest='config', 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.') help='Main configuration file.')
parser.add_argument('-U', '--user-config', action='store', dest='user_config', default='/etc/pwnagotchi/config.yml', 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.') help='If this file exists, configuration will be merged and this will override default values.')

3
setup.py

@ -18,7 +18,8 @@ setup(name='pwnagotchi',
license='GPL', license='GPL',
install_requires=required, install_requires=required,
scripts=['bin/pwnagotchi'], scripts=['bin/pwnagotchi'],
package_data={'pwnagotchi': ('pwnagotchi/defaults.yml',)}, package_data={'pwnagotchi': ['defaults.yml', 'pwnagotchi/defaults.yml']},
include_package_data=True,
packages=find_packages(), packages=find_packages(),
classifiers=[ classifiers=[
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',