<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11143">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
osmith: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">find the terminal once and abort if missing<br><br>Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3<br>---<br>M net/tmpl_std/run.sh<br>1 file changed, 16 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh</span><br><span>index 57dcc23..cca7a75 100755</span><br><span>--- a/net/tmpl_std/run.sh</span><br><span>+++ b/net/tmpl_std/run.sh</span><br><span>@@ -34,18 +34,30 @@</span><br><span> logdir="current_log"</span><br><span> mkdir -p "$logdir"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+find_term() {</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find a terminal program and write to the global "terminal" variable</span><br><span style="color: hsl(120, 100%, 40%);">+ local programs="urxvt xterm"</span><br><span style="color: hsl(120, 100%, 40%);">+ local program</span><br><span style="color: hsl(120, 100%, 40%);">+ for program in $programs; do</span><br><span style="color: hsl(120, 100%, 40%);">+ terminal="$(which $program)"</span><br><span style="color: hsl(120, 100%, 40%);">+ [ -n "$terminal" ] && return</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # No terminal found</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: Couldn't find terminal program! Looked for: $programs"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> term() {</span><br><span> title="$2"</span><br><span> if [ -z "$title" ]; then</span><br><span> title="$(basename $@)"</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">- terminal="$(which urxvt || which xterm)"</span><br><span style="color: hsl(0, 100%, 40%);">- if ! which $terminal; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "CANNOT FIND XTERM PROGRAM"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span> exec $terminal -title "CN:$title" -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'; $1; echo; while true; do echo 'q Enter to close'; read q_to_close; if [ \"x\$q_to_close\" = xq ]; then break; fi; done"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+find_term</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 &</span><br><span> sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 &</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11143">change 11143</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11143"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-dev </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 </div>
<div style="display:none"> Gerrit-Change-Number: 11143 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>