[Swift-commit] r7738 - branches/release-0.94/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-03-19 14:01:07 -0500 (Wed, 19 Mar 2014)
New Revision: 7738

Modified:
   branches/release-0.94/bin/gensites
   branches/release-0.94/bin/start-coaster-service
Log:
Fixes for start-coaster-service and gensites on mac


Modified: branches/release-0.94/bin/gensites
===================================================================
--- branches/release-0.94/bin/gensites	2014-03-19 18:56:17 UTC (rev 7737)
+++ branches/release-0.94/bin/gensites	2014-03-19 19:01:07 UTC (rev 7738)
@@ -180,12 +180,12 @@
                   COMMAND_DIRNAME=$(dirname $COMMAND)
                   if [ -d "$COMMAND_DIRNAME" ]; then
                      COMMAND_PATH=$(cd $COMMAND_DIRNAME; pwd)/$(basename $COMMAND)
-                     if ! grep -xq "$HOST $NAME $COMMAND_PATH " apps ; then
-                         echo "$HOST $NAME $COMMAND_PATH " >> apps
+                     if ! grep -xq "$HOST $NAME $COMMAND_PATH" apps ; then
+                         echo "$HOST $NAME $COMMAND_PATH" >> apps
                      fi
                   else
-                     if ! grep -xq "$HOST $NAME $COMMAND_PATH " apps ; then
-                         echo "$HOST $NAME $COMMAND_PATH " >> apps
+                     if ! grep -xq "$HOST $NAME $COMMAND_PATH" apps ; then
+                         echo "$HOST $NAME $COMMAND_PATH" >> apps
                      fi
                   fi
               done
@@ -199,8 +199,8 @@
                     COMMAND=`echo $line|awk '{print $3}'|cut -d'=' -f2`
                     COMMAND=`eval echo $COMMAND`
                     COMMAND_PATH=$(cd $(dirname $COMMAND); pwd)/$(basename $COMMAND)
-                    if ! grep -xq "$HOST $NAME $COMMAND_PATH " apps ; then
-                        eval echo "$HOST $NAME $COMMAND_PATH " >> apps
+                    if ! grep -xq "$HOST $NAME $COMMAND_PATH" apps ; then
+                        eval echo "$HOST $NAME $COMMAND_PATH" >> apps
                      fi
                  fi
                done

Modified: branches/release-0.94/bin/start-coaster-service
===================================================================
--- branches/release-0.94/bin/start-coaster-service	2014-03-19 18:56:17 UTC (rev 7737)
+++ branches/release-0.94/bin/start-coaster-service	2014-03-19 19:01:07 UTC (rev 7738)
@@ -112,10 +112,10 @@
 fi
 
 #clean up coaster conf
-sed -i '/export WORKERURL=/d' $CONFIG_FILE
-sed -i '/export PID_FILE=/d' $CONFIG_FILE
-sed -i '/export LOG=/d' $CONFIG_FILE
-sed -i '/export LOCAL_PORT=/d' $CONFIG_FILE
+sed -i '' '/export WORKERURL=/d' $CONFIG_FILE
+sed -i '' '/export PID_FILE=/d' $CONFIG_FILE
+sed -i '' '/export LOG=/d' $CONFIG_FILE
+sed -i '' '/export LOCAL_PORT=/d' $CONFIG_FILE
 
 echo "Start-coaster-service..."
 echo "Configuration: $CONFIG_FILE"
@@ -151,11 +151,11 @@
 
 # Create files for storing port info, if needed
 if [ -z "$LOCAL_PORT" ]; then
-   LOCAL_PORT_FILE=$( mktemp )
+   LOCAL_PORT_FILE=$( mktemp XXXXXXX )
 fi
 
 if [ -z "$SERVICE_PORT" ]; then
-   SERVICE_PORT_FILE=$( mktemp )
+   SERVICE_PORT_FILE=$( mktemp XXXXXXX )
 fi
 
 # Check values in configuration file to determine how we should start coaster-service