[Swift-commit] r4364 - SwiftApps/SwiftR/Swift/exec
tga at ci.uchicago.edu
tga at ci.uchicago.edu
Wed Apr 13 13:39:11 CDT 2011
Author: tga
Date: 2011-04-13 13:39:10 -0500 (Wed, 13 Apr 2011)
New Revision: 4364
Modified:
SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
SwiftApps/SwiftR/Swift/exec/compat-setup
SwiftApps/SwiftR/Swift/exec/configure-server-cobalt
SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
SwiftApps/SwiftR/Swift/exec/configure-server-local
SwiftApps/SwiftR/Swift/exec/configure-server-pbs
SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto
SwiftApps/SwiftR/Swift/exec/configure-server-sge
SwiftApps/SwiftR/Swift/exec/configure-server-ssh
SwiftApps/SwiftR/Swift/exec/fiforead
SwiftApps/SwiftR/Swift/exec/fifowrite
SwiftApps/SwiftR/Swift/exec/killtree
SwiftApps/SwiftR/Swift/exec/passive-coaster-swift
SwiftApps/SwiftR/Swift/exec/start-merlot
SwiftApps/SwiftR/Swift/exec/start-swift
SwiftApps/SwiftR/Swift/exec/start-swift-Rserver
SwiftApps/SwiftR/Swift/exec/start-swift-daemon
SwiftApps/SwiftR/Swift/exec/start-swift-workers
Log:
Compatibility fix: user consistent shebang for sheel scripts to ensure bash is run.
Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
# Arguments: inputBatchSaveFile outputBatchSaveFile
# bash @shellscript @RServerScript @rcall @result stdout=@stout stderr=@sterr;
Modified: SwiftApps/SwiftR/Swift/exec/compat-setup
===================================================================
--- SwiftApps/SwiftR/Swift/exec/compat-setup 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/compat-setup 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /usr/bin/env bash
# sets variables to handle compatibility issues
if [ -f "`which seq 2> /dev/null`" ]
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
# configuration for cobalt with manually-started Swift workers (passive coasters)
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxt 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxt 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!i /usr/bin/env bash
# configuration for PBS with manually-started Swift workers (passive coasters)
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-local
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
throttleOneCore="0.00" # FIXME: test if new swft fix makes zero OK rather than -0.001
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbs
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-pbs 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-pbs 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
# configuration for PBS with manually-started Swift workers (passive coasters)
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
throttlePBS=.31 # FIXME: parameterize thsi and several other variables, below.
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-sge
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
# Generate Swift configuration files for SGE with manually-started Swift workers (passive coasters)
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-ssh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-ssh 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-ssh 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
cores=$1
throttle=$2
Modified: SwiftApps/SwiftR/Swift/exec/fiforead
===================================================================
--- SwiftApps/SwiftR/Swift/exec/fiforead 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/fiforead 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /usr/bin/env bash
# Read contents of a fifo with a timeout
# If reading from a fifo fails within timeout specified
# with -t option in milliseconds then the message _FIFOTIMEOUT_ with
Modified: SwiftApps/SwiftR/Swift/exec/fifowrite
===================================================================
--- SwiftApps/SwiftR/Swift/exec/fifowrite 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/fifowrite 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#! /usr/bin/env bash
# Write to a fifo with a timeout, with the data specified by the -m option
# If writing from a fifo is blocked after timeout specified
# with -t option in milliseconds then this script exits with code 2.
Modified: SwiftApps/SwiftR/Swift/exec/killtree
===================================================================
--- SwiftApps/SwiftR/Swift/exec/killtree 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/killtree 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,5 @@
-#!/bin/sh
+#! /usr/bin/env bash
+
tokill=$1
while [ ! -z $tokill ]
do
Modified: SwiftApps/SwiftR/Swift/exec/passive-coaster-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/passive-coaster-swift 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/passive-coaster-swift 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
COMPUTEHOSTS=$1
# COMPUTEHOSTS='crush thwomp stomp crank steamroller grind churn trounce thrash vanquish'
Modified: SwiftApps/SwiftR/Swift/exec/start-merlot
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-merlot 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/start-merlot 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
# Define internal functions
Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
export TRAPEVENTS="EXIT 1 2 3 15" # Signals and conditions to trap
Modified: SwiftApps/SwiftR/Swift/exec/start-swift-Rserver
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift-Rserver 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/start-swift-Rserver 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
SWIFTRBIN=$(cd $(dirname $0); pwd)
Modified: SwiftApps/SwiftR/Swift/exec/start-swift-daemon
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift-daemon 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/start-swift-daemon 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /usr/bin/env bash
# This script is intended as a helper script to let
# R launch start-swift. It works around the limitations
# of the R system command, which cannot retrieve
Modified: SwiftApps/SwiftR/Swift/exec/start-swift-workers
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift-workers 2011-04-13 18:02:28 UTC (rev 4363)
+++ SwiftApps/SwiftR/Swift/exec/start-swift-workers 2011-04-13 18:39:10 UTC (rev 4364)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
Usage()
{
More information about the Swift-commit
mailing list