From: Paul K. <pki...@us...> - 2007-06-29 00:35:08
|
Update of /cvsroot/octave/octave-forge/admin/MacOSX/createapp In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31507 Modified Files: applicationstartup.sh.in octave.in Log Message: Initial support for paths with spaces Index: applicationstartup.sh.in =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/createapp/applicationstartup.sh.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- applicationstartup.sh.in 27 Jun 2007 16:17:28 -0000 1.1 +++ applicationstartup.sh.in 29 Jun 2007 00:35:08 -0000 1.2 @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA -ROOT=${0%/script} +ROOT="${0%/script}" if [ -z ${OCTAVE_TERMINAL} ]; then # This is the startup procedure written as AppleScript to open a @@ -25,7 +25,7 @@ osascript 2>&1>/dev/null <<EOF tell application "Terminal" activate - do script "${ROOT}/bin/octave" + do script "'${ROOT}/bin/octave'" end tell EOF @@ -36,7 +36,7 @@ open "/Applications/Utilities/X11.app" if [ -z ${DISPLAY} ]; then export DISPLAY=:0.0; fi /usr/X11R6/bin/xterm -fn -adobe-courier-medium-*-*-*-14-*-*-*-*-*-*-* \ - -e "${ROOT}/bin/octave"; + -e "'${ROOT}/bin/octave'"; fi # Quit the Octave application immediately after startup (ie. quitting Index: octave.in =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/MacOSX/createapp/octave.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- octave.in 27 Jun 2007 19:42:45 -0000 1.2 +++ octave.in 29 Jun 2007 00:35:08 -0000 1.3 @@ -17,18 +17,16 @@ # Checks if Octave is started from a file that is a link or if this # file has been taken directly to startup the Octave program. -LINK=`readlink ${0}` -if [ -z ${LINK} ]; then - THIS=`cd . 2>/dev/null && pwd` +LINK="`readlink ${0}`" +if [ -z "${LINK}" ]; then BASE="${0%/bin/octave}" - ROOT=`cd ${BASE} 2>/dev/null && pwd` - cd ${THIS} else - THIS=`cd . 2>/dev/null && pwd` - BASE=${LINK%/bin/octave} # `dirname ${0}`/${LINK%/bin/octave} - ROOT=`cd ${BASE} 2>/dev/null && pwd` - cd ${THIS} -fi # echo "BASE: ${BASE} --- ROOT: ${ROOT}"; exit + BASE="${LINK%/bin/octave}" # `dirname ${0}`/${LINK%/bin/octave} +fi +THIS="`cd . 2>/dev/null && pwd`" +ROOT="`cd "${BASE}" 2>/dev/null && pwd`" +cd "${THIS}" +# echo "BASE: ${BASE} --- ROOT: ${ROOT}"; exit # Setting up various path information variables that are needed to # startup the Octave program. @@ -39,11 +37,11 @@ # Setting up various path information variables that are needed to run # the "mkoctfile" and "mex" commands from within the Octave program. -CFLAGS="-I${ROOT}/include -I${ROOT}/include/octave-%VERSION% -arch %ARCH%" -CFLAGS="${CFLAGS} -I${ROOT}/include/curl -I${ROOT}/include/readline" -CPPFLAGS=${CFLAGS} -CXXFLAGS=${CXXFLAGS} -LDFLAGS="-L${ROOT}/lib -L${ROOT}/lib/octave-%VERSION% -arch %ARCH%" +CFLAGS="-I'${ROOT}/include' -I'${ROOT}/include/octave-%VERSION%' -arch %ARCH%" +CFLAGS="${CFLAGS} -I'${ROOT}/include/curl' -I'${ROOT}/include/readline'" +CPPFLAGS="${CFLAGS}" +CXXFLAGS="${CXXFLAGS}" +LDFLAGS="-L'${ROOT}/lib' -L'${ROOT}/lib/octave-%VERSION%' -arch %ARCH%" # Export the variables that have been defined before so that the # Octave program gets knowledge about them. |