diff --git a/Makefile b/Makefile index 6f5ed59..b74a4b5 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,18 @@ cleanbuildozer: cleanall: clean cleanbuildozer +remove_symlinks: + @echo Removing symlinks for build... + -rm ./RNS + -rm ./LXST + -rm ./LXMF + +create_symlinks: + @echo Creating symlinks... + -ln -s ../Reticulum/RNS ./RNS + -ln -s ../LXST/LXST ./LXST + -ln -s ../LXMF/LXMF ./LXMF + preparewheel: pyclean . $(MAKE) -C sbapp cleanrns diff --git a/README.md b/README.md index 2272c88..114ed01 100644 --- a/README.md +++ b/README.md @@ -204,11 +204,11 @@ If you install Sideband from the DMG file, it is still recommended to install th ```bash # Install Reticulum and utilities with pip: -pip3 install rns +pip3 install rns --user # On some versions, you may need to use the # flag --break-system-packages to install: -pip3 install rns --break-system-packages +pip3 install rns --user --break-system-packages ``` If you do not have Python and `pip` available, [download and install it](https://www.python.org/downloads/) first. @@ -223,7 +223,10 @@ To install Sideband via `pip`, follow these instructions: ```bash # Install Sideband and dependencies on macOS using pip: -pip3 install sbapp +pip3 install sbapp --user + +# Or, if your Python environment is externally managed: +pip3 install sbapp --user --break-system-packages # Run Sideband from the terminal: ################################# diff --git a/sbapp/main.py b/sbapp/main.py index 0a4cec8..0fdffbd 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -4109,12 +4109,14 @@ class SidebandApp(MDApp): info = "Sideband is connected via a shared Reticulum instance running on this system.\n\n" info += "To get connectivity status, use the [b]rnstatus[/b] utility.\n\n" info += "To configure connectivity, edit the configuration file located at:\n\n" - info += str(RNS.Reticulum.configpath) + if not RNS.vendor.platformutils.is_windows(): info += str(RNS.Reticulum.configpath) + else: info += str(RNS.Reticulum.configpath.replace("/", "\\")) else: info = "Sideband is currently running a standalone or master Reticulum instance on this system.\n\n" info += "To get connectivity status, use the [b]rnstatus[/b] utility.\n\n" info += "To configure connectivity, edit the configuration file located at:\n\n" - info += str(RNS.Reticulum.configpath) + if not RNS.vendor.platformutils.is_windows(): info += str(RNS.Reticulum.configpath) + else: info += str(RNS.Reticulum.configpath.replace("/", "\\")) self.connectivity_screen.ids.connectivity_info.text = info @@ -4438,11 +4440,13 @@ class SidebandApp(MDApp): if self.sideband.reticulum.is_connected_to_shared_instance: info = "Sideband is connected via a shared Reticulum instance running on this system.\n\n" info += "To configure hardware parameters, edit the configuration file located at:\n\n" - info += str(RNS.Reticulum.configpath) + if not RNS.vendor.platformutils.is_windows(): info += str(RNS.Reticulum.configpath) + else: info += str(RNS.Reticulum.configpath.replace("/", "\\")) else: info = "Sideband is currently running a standalone or master Reticulum instance on this system.\n\n" info += "To configure hardware parameters, edit the configuration file located at:\n\n" - info += str(RNS.Reticulum.configpath) + if not RNS.vendor.platformutils.is_windows(): info += str(RNS.Reticulum.configpath) + else: info += str(RNS.Reticulum.configpath.replace("/", "\\")) self.hardware_screen.ids.hardware_info.text = info diff --git a/setup.py b/setup.py index 5cafe98..58970b3 100644 --- a/setup.py +++ b/setup.py @@ -116,17 +116,15 @@ setuptools.setup( install_requires=[ "rns>=1.0.4", "lxmf>=0.9.3", + "lxst>=0.4.4", "kivy>=2.3.0", + "numpy>=2.0.0", "pillow>=10.2.0", + "mistune>=3.0.2", "qrcode", "materialyoucolor>=2.0.7", - "sh", - "numpy>=2.0.0", - "lxst>=0.4.4", - "mistune>=3.0.2", "beautifulsoup4", "pycodec2>=4.1.0", - "pyaudio;sys.platform=='linux'", "pyobjus;sys.platform=='darwin'", "pyogg;sys.platform=='Windows' and sys.platform!='win32'", "audioop-lts>=0.2.1;python_version>='3.13'"