Skip to content

Commit 54b2e98

Browse files
committed
Remove -t from most scripts-ssh invocations so stderr and stdout are kept separate
1 parent 91eb337 commit 54b2e98

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

bin/scripts-ssh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ exec ssh \
1010
-o ForwardX11=no \
1111
-o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
1212
-o UserKnownHostsFile=/dev/null \
13-
-t \
1413
scripts.mit.edu -l "$lname" "$(printf "''%q " "$@")"
1514

1615
# ssh gets quoting wrong, so we do it ourself with printf "%q ".

deploy/bin/onathena

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ fi
219219

220220
if [ "$wizard" != "" ]; then
221221
if [ "$create_scripts_dir" -eq 1 ]; then
222-
vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "--web-stub-path" "$lroot/web_scripts/$addrend" "$@" "$wizard" "$lroot/Scripts/$deploy/$addrend"
222+
vsshrun -t "/mit/$ailocker/wizard/bin/wizard" "install" "--web-stub-path" "$lroot/web_scripts/$addrend" "$@" "$wizard" "$lroot/Scripts/$deploy/$addrend"
223223
else
224-
vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
224+
vsshrun -t "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
225225
fi
226226
exit 0
227227
fi
@@ -253,7 +253,7 @@ fi
253253

254254
if [ "$prompt_password" -eq 1 ]; then
255255
stty -echo
256-
sshrun "/mit/$ailocker/deploy$scriptsdev/bin/prompt-password" "$sname" "$deploy" "$addrend" "$admin_username"
256+
sshrun -t "/mit/$ailocker/deploy$scriptsdev/bin/prompt-password" "$sname" "$deploy" "$addrend" "$admin_username"
257257
stty echo
258258
fi
259259

@@ -276,7 +276,7 @@ if [ -f "/mit/$ailocker/deploy$scriptsdev/php.ini/$deploy" ]; then
276276
fi
277277
cd "$origdir"
278278

279-
vsshrun "/mit/$ailocker/deploy$scriptsdev/bin/$deploy" "$sname" "$deploy" "$addrend" "$admin_username" "$requires_sql" "$scriptsdev" "${ATHENA_USER:-$USER}" || die "Unknown failure during configuration"
279+
vsshrun -t "/mit/$ailocker/deploy$scriptsdev/bin/$deploy" "$sname" "$deploy" "$addrend" "$admin_username" "$requires_sql" "$scriptsdev" "${ATHENA_USER:-$USER}" || die "Unknown failure during configuration"
280280
rm -f "$lroot/web_scripts/$addrend/.scripts-tmp"
281281
checkfailed
282282

0 commit comments

Comments
 (0)