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

refactor

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-04 00:33:06 +02:00
parent 641334c254
commit affb8c27c3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/release.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# nothing to see here, just a utility i use to create new releases ^_^ # nothing to see here, just a utility i use to create new releases ^_^
VERSION_FILE=$(dirname "${BASH_SOURCE[0]}")/../sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py VERSION_FILE=$(dirname "${BASH_SOURCE[0]}")/../sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/__init__.py
echo "version file is $VERSION_FILE" echo "version file is $VERSION_FILE"
CURRENT_VERSION=$(cat $VERSION_FILE | grep version | cut -d"'" -f2) CURRENT_VERSION=$(cat $VERSION_FILE | grep version | cut -d"'" -f2)
TO_UPDATE=( TO_UPDATE=(

3
sdcard/rootfs/root/pwnagotchi/scripts/main.py
View File

@ -5,7 +5,6 @@ import logging
import pwnagotchi import pwnagotchi
import pwnagotchi.utils as utils import pwnagotchi.utils as utils
import pwnagotchi.version as version
import pwnagotchi.plugins as plugins import pwnagotchi.plugins as plugins
from pwnagotchi.log import SessionParser from pwnagotchi.log import SessionParser
@ -39,7 +38,7 @@ plugins.on('loaded')
display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()}) display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()})
agent = Agent(view=display, config=config) agent = Agent(view=display, config=config)
logging.info("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, version.version)) logging.info("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, pwnagotchi.version))
for _, plugin in plugins.loaded.items(): for _, plugin in plugins.loaded.items():
logging.debug("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__)) logging.debug("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__))

2
sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/__init__.py
View File

@ -1,5 +1,7 @@
import subprocess import subprocess
version = '1.0.0plz2'
_name = None _name = None

3
sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
View File

@ -2,7 +2,6 @@ import _thread
import logging import logging
import pwnagotchi import pwnagotchi
import pwnagotchi.version as version
import pwnagotchi.plugins as plugins import pwnagotchi.plugins as plugins
from pwnagotchi.mesh import get_identity from pwnagotchi.mesh import get_identity
@ -24,7 +23,7 @@ class AsyncAdvertiser(object):
self._advertiser = Advertiser( self._advertiser = Advertiser(
self._config['main']['iface'], self._config['main']['iface'],
pwnagotchi.name(), pwnagotchi.name(),
version.version, pwnagotchi.version,
self._identity, self._identity,
period=0.3, period=0.3,
data=self._config['personality']) data=self._config['personality'])