Author: nextgens
Date: 2008-05-09 05:23:32 +0000 (Fri, 09 May 2008)
New Revision: 19864
Modified:
trunk/apps/new_installer/res/unix/run.sh
Log:
new_installer: fix the issue with spaces in paths for real
Modified: trunk/apps/new_installer/res/unix/run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/run.sh 2008-05-09 03:10:06 UTC (rev
19863)
+++ trunk/apps/new_installer/res/unix/run.sh 2008-05-09 05:23:32 UTC (rev
19864)
@@ -115,8 +115,10 @@
fi
done
done
+
# Change ":" chars back to spaces.
- REALPATH=`echo $REALPATH | sed -e 's;:; ;g'`
+ REALPATH="`echo $REALPATH | sed -e 's;:; ;g'`"
+ SCRIPT="`echo $SCRIPT | sed -e 's;:; ;g'`"
if [ "$REALPATH" = "$SCRIPT" ]
then
@@ -127,7 +129,7 @@
done
# Change the current directory to the location of the script
-cd "`dirname "$REALPATH"`"
+cd "`dirname \"$REALPATH\"`"
REALDIR="`pwd`"
# If the PIDDIR is relative, set its value relative to the full REALPATH to
avoid problems if
@@ -290,14 +292,14 @@
ANCHORPROP=
IGNOREPROP=
else
- ANCHORPROP="wrapper.anchorfile=$ANCHORFILE"
+ ANCHORPROP=wrapper.anchorfile=\"$ANCHORFILE\"
IGNOREPROP=wrapper.ignore_signals=TRUE
fi
# Build the lock file clause. Only create a lock file if the lock directory
exists on this platform.
if [ -d "$LOCKDIR" ]
then
- LOCKPROP="wrapper.lockfile=$LOCKFILE"
+ LOCKPROP=wrapper.lockfile=\"$LOCKFILE\"
else
LOCKPROP=
fi
@@ -411,8 +413,8 @@
getpid
if [ "X$pid" = "X" ]
then
- COMMAND_LINE="$CMDNICE $WRAPPER_CMD $WRAPPER_CONF
wrapper.syslog.ident=$APP_NAME wrapper.pidfile=$PIDFILE $LDPROP $ANCHORPROP
$LOCKPROP"
- exec $COMMAND_LINE
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\"
wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" $LDPROP
$ANCHORPROP $LOCKPROP"
+ eval $COMMAND_LINE
else
echo "$APP_LONG_NAME is already running."
exit 1
@@ -428,10 +430,10 @@
then
echo ""
echo "Let's start the node without the wrapper, you'll have to
daemonize it yourself."
- exec $NO_WRAPPER
+ eval $NO_WRAPPER
else # Otherwise use the wrapper
- COMMAND_LINE="$CMDNICE $WRAPPER_CMD $WRAPPER_CONF
wrapper.syslog.ident=$APP_NAME wrapper.pidfile=$PIDFILE $LDPROP
wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
- exec $COMMAND_LINE
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\"
wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" $LDPROP
wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
+ eval $COMMAND_LINE
fi
else
echo "$APP_LONG_NAME is already running."
