Commit 58718517 authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Merge remote branch 'origin/michel' into jeroen

Conflicts:
	console/console/start_console.sh
parents 8853f790 502d9a90
#!/bin/sh
#!/bin/bash
PATH=$PWD:$PATH
#await_controller
if [ $? -eq 1 ]
then
echo "Start-up niet mogelijk; controller-PC is niet goed opgestart\n"
# exit 1
fi
screen -dmS console
screen -S console -X screen -t trace_proxy trace_proxy
screen -S console -X screen -t spg_auth spg_auth
screen -S console -X screen -t log_proxy log_proxy
screen -dmS trace_proxy trace_proxy
screen -dmS spg_auth spg_auth
screen -dmS log_proxy log_proxy
sleep 1
screen -dmS console_idle console_idle
screen -dmS console_dt_model
screen -dmS console_j2000tracker console_j2000tracker
screen -dmS console_j2000_indi indiserver console_j2000_indi
screen -dmS console_moontracker console_moontracker
screen -dmS console_suntracker console_suntracker
screen -dmS console_azel console_azel
screen -dmS console_manual console_manual
screen -dmS console_sattracker console_sattracker
screen -dmS console_weather console_weather
screen -S console -X screen -t console_idle console_idle
screen -S console -X screen -t console_dt_model
screen -S console -X screen -t console_j2000tracker console_j2000tracker
screen -S console -X screen -t console_j2000_indi indiserver console_j2000_indi
screen -S console -X screen -t console_moontracker console_moontracker
screen -S console -X screen -t console_suntracker console_suntracker
screen -S console -X screen -t console_azel console_azel
screen -S console -X screen -t console_manual console_manual
screen -S console -X screen -t console_sattracker console_sattracker
screen -S console -X screen -t console_weather console_weather
../htdocs/dt_host.ini
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment