Skip to content

Commit

Permalink
Merge pull request #267 from linien-org/feature/fix-scripts
Browse files Browse the repository at this point in the history
Fix missing `.sh` file extension for running some scripts
  • Loading branch information
bleykauf authored Apr 12, 2022
2 parents 1a09ee8 + 067aad3 commit 96d4d58
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions linien/gui/ui/device_manager.py
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
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
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

0 comments on commit 96d4d58

Please sign in to comment.