osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/27035 )
Change subject: net: run.sh: write launcher command to shell script
......................................................................
net: run.sh: write launcher command to shell script
Instead of passing a whole script to the terminal via command-line
argument, write it to a file. This is in preparation to use the same
script with tmux, see next patch.
Change-Id: I15760d706b20628421c10a16514120f442d5477f
---
M net/templates/run.sh
1 file changed, 27 insertions(+), 13 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 426ed91..332b168 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -40,7 +40,9 @@
logdir="current_log"
piddir="run/pids"
-mkdir -p "$logdir" "$piddir"
+launcherdir="run/launchers"
+rm -rf "$launcherdir"
+mkdir -p "$logdir" "$piddir" "$launcherdir"
find_term() {
# Find a terminal program and write to the global "terminal" variable
@@ -93,20 +95,32 @@
local pidfile_term="$piddir/$title.term.pid"
pidfiles_must_not_exist "$pidfile" "$pidfile_term"
+ local launcher="$launcherdir/$title.sh"
+
+ cat << EOF > "$launcher"
+#!/bin/sh
+
+export LD_LIBRARY_PATH='/usr/local/lib'
+
+$1 &
+echo \$! > $pidfile
+wait
+
+echo
+
+while true; do
+ echo 'q Enter to close'
+ read q_to_close
+ if [ "x\$q_to_close" = xq ]; then
+ break
+ fi
+done
+EOF
+ chmod +x "$launcher"
+
$terminal \
-title "CN:$title" \
- -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'
- $1 &
- echo \$! > $pidfile
- wait
- echo
- while true; do
- echo 'q Enter to close'
- read q_to_close
- if [ \"x\$q_to_close\" = xq ]; then
- break
- fi
- done" \
+ -e sh -c "$launcher" \
&
echo "$!" > "$pidfile_term"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27035
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I15760d706b20628421c10a16514120f442d5477f
Gerrit-Change-Number: 27035
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: neels <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-MessageType: merged
