From 4b3c7d0aece38e0984661ca37fb9f5baeaf29e5b Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 14 Jul 2011 12:04:38 -0400 Subject: [PATCH] Switch tcsh(!) and bash scripts to use /bin/sh. (Satisfy some 3rd-party packaging linters.) (cherry picked from commit 69464bba9194fb38418d59f5f918b961c8c18cdd) --- collects/2htdp/tests/xtest | 69 +++++++++++++-------------------- collects/2htdp/uchat/xrun | 6 +-- collects/meta/drdr/copy.sh | 3 +- collects/meta/drdr/good-init.sh | 7 ++-- 4 files changed, 37 insertions(+), 48 deletions(-) diff --git a/collects/2htdp/tests/xtest b/collects/2htdp/tests/xtest index 1427362f9c..d2561c46db 100755 --- a/collects/2htdp/tests/xtest +++ b/collects/2htdp/tests/xtest @@ -1,43 +1,30 @@ -#!/bin/tcsh +#!/bin/sh -gracket bad-draw.rkt -echo "done:--- bad-draw.rkt ---" echo "" -racket batch-io.rkt -echo "done:--- batch-io.rkt ---" echo "" -gracket clause-once.rkt -echo "done:--- clause-once.rkt ---" echo "" -gracket full-scene-visible.rkt -echo "done:--- full-scene-visible.rkt ---" echo "" -gracket image-too-large.rkt -echo "done:--- image-too-large.rkt ---" echo "" -gracket image-equality-performance-htdp.rkt -echo "done:--- image-equality-performance-htdp.rkt ---" echo "" -gracket image-equality-performance.rkt -echo "done:--- image-equality-performance.rkt ---" echo "" -gracket mouse-evt.rkt -echo "done:--- mouse-evt.rkt ---" echo "" -gracket on-tick-defined.rkt -echo "done:--- on-tick-defined.rkt ---" echo "" -gracket perform-robby.rkt -echo "done:--- perform-robby.rkt ---" echo "" -gracket profile-robby.rkt -echo "done:--- profile-robby.rkt ---" echo "" -gracket release.rkt -echo "done:--- release.rkt ---" echo "" -gracket stop.rkt -echo "done:--- stop.rkt ---" echo "" -gracket test-image.rkt -echo "done:--- test-image.rkt ---" echo "" -gracket ufo-rename.rkt -echo "done:--- ufo-rename.rkt ---" echo "" -gracket server-rename.rkt -echo "done:--- server-rename.rkt ---" echo "" -gracket world0-stops.rkt -echo "done:--- world0-stops.rkt ---" echo "" -gracket record.rkt -echo "done:--- record.rkt ---" echo "" -gracket record-stop-when.rkt -echo "done:--- record-stop-when.rkt ---" echo "" +run() { + exe="gracket" + if [ "x$1" = "x-t" ]; then exe="racket"; fi + "$exe" "$1" + echo "done:--- $1 ---" + echo "" +} -gracket stop-when-crash.rkt -echo "done:--- stop-when-crash.rkt ---" echo "" +run bad-draw.rkt +run -t batch-io.rkt +run clause-once.rkt +run full-scene-visible.rkt +run image-too-large.rkt +run image-equality-performance-htdp.rkt +run image-equality-performance.rkt +run mouse-evt.rkt +run on-tick-defined.rkt +run perform-robby.rkt +run profile-robby.rkt +run release.rkt +run stop.rkt +run test-image.rkt +run ufo-rename.rkt +run server-rename.rkt +run world0-stops.rkt +run record.rkt +run record-stop-when.rkt +run stop-when-crash.rkt diff --git a/collects/2htdp/uchat/xrun b/collects/2htdp/uchat/xrun index 27361d78a4..833373fb5e 100755 --- a/collects/2htdp/uchat/xrun +++ b/collects/2htdp/uchat/xrun @@ -1,4 +1,4 @@ -#!/bin/tcsh +#!/bin/sh -mred server.ss & -mred chatter.ss -e"(run* 'go)" & +gracket server.rkt & +gracket chatter.rkt -e"(run* 'go)" & diff --git a/collects/meta/drdr/copy.sh b/collects/meta/drdr/copy.sh index 71ba9b1858..c529dc4e92 100755 --- a/collects/meta/drdr/copy.sh +++ b/collects/meta/drdr/copy.sh @@ -1,2 +1,3 @@ -#!/bin/bash +#!/bin/sh + rsync -avz . drdr:/opt/svn/drdr/ --exclude=compiled --delete --exclude=data diff --git a/collects/meta/drdr/good-init.sh b/collects/meta/drdr/good-init.sh index 2cbc5c170c..547ee019fd 100755 --- a/collects/meta/drdr/good-init.sh +++ b/collects/meta/drdr/good-init.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/sh + export PLTSTDERR="info" PLTROOT="/opt/plt/plt" LOGS="/opt/plt/logs" @@ -19,7 +20,7 @@ kill_all() { run_loop () { # while true; do - if [[ "x$2" = "xyes" ]]; then + if [ "x$2" = "xyes" ]; then echo "clearing unattached shm regions" ipcs -ma | awk '0 == $6 {print $2}' | xargs -n 1 ipcrm -m fi @@ -31,7 +32,7 @@ run_loop () { # wait "$!" echo "$1: died" rm "$LOGS/$1.pid" - if [[ "x$2" = "xyes" ]]; then + if [ "x$2" = "xyes" ]; then echo "killing processes" kill_all fi