refactor

scripts/release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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"
 CURRENT_VERSION=$(cat $VERSION_FILE | grep version | cut -d"'" -f2)
 TO_UPDATE=(

sdcard/rootfs/root/pwnagotchi/scripts/main.py

@@ -5,7 +5,6 @@ import logging
 
 import pwnagotchi
 import pwnagotchi.utils as utils
-import pwnagotchi.version as version
 import pwnagotchi.plugins as plugins
 
 from pwnagotchi.log import SessionParser
@@ -39,7 +38,7 @@ plugins.on('loaded')
 display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()})
 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():
     logging.debug("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__))

sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/__init__.py

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

sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py

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