Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missing .sh file extension for running some scripts #267

Merged
merged 2 commits into from
Apr 12, 2022
Merged

Fix missing .sh file extension for running some scripts #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6c6b0e
fix: add missing file extensions
bleykauf Apr 12, 2022
067aad3
fix: add file extension in popup message
bleykauf Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions linien/gui/ui/device_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def invalid_server_version(remote_version, client_version):
A production version is installed on the RedPitaya,
but the client uses a development version. Stop the
server and uninstall the version on the RedPitaya using\n
linien_stop_server;\n
linien_stop_server.sh;\n
pip3 uninstall linien-server\n
before trying it again.
""" # noqa: W291
Expand Down Expand Up @@ -216,7 +216,7 @@ def install_linien_server(self, device, version=None):
if version is not None:
version_string = "==" + version
# stop server if another version of linien is installed
stop_server_command = "linien_stop_server;"
stop_server_command = "linien_stop_server.sh;"

self.ssh_command = execute_command_and_show_output(
self,
Expand Down
2 changes: 1 addition & 1 deletion linien/server/linien_start_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
pth=`python3 -c 'import linien; print(linien.__path__[0]);'`

# quit any remaining screen session
if [ -x "$(command -v linien_stop_server)" ]; then
if [ -x "$(command -v linien_stop_server.sh)" ]; then
linien_stop_server
fi
screen -X -S linien-server quit
Expand Down
2 changes: 1 addition & 1 deletion linien/server/linien_stop_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

screen -X -S linien-server quit
bash linien_start_ethernet_blinking
bash linien_start_ethernet_blinking.sh