From 2fa703aac23f02f47df550a239d07ef7c1d4c5df Mon Sep 17 00:00:00 2001 From: kaloyane <kaloyane> Date: Fri, 14 Oct 2011 21:25:01 +0000 Subject: [PATCH] bugfix: rewrite sed command so that it works on Mac OS *and* on Linux SVN: 23333 --- installation/resource/installer/bin/upgrade.sh | 3 ++- screening/dist/admin/upgrade.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/installation/resource/installer/bin/upgrade.sh b/installation/resource/installer/bin/upgrade.sh index 11a1aeadac9..a706004fa00 100755 --- a/installation/resource/installer/bin/upgrade.sh +++ b/installation/resource/installer/bin/upgrade.sh @@ -23,7 +23,8 @@ popd > /dev/null # set INSTALL_PATH in the console.properties sed_params='s#^INSTALL_PATH=.*$#INSTALL_PATH='$OPENBIS_INSTALL_DIR'#' -sed -i '' "$sed_params" $INSTALLER_DIR/console.properties +sed "$sed_params" $INSTALLER_DIR/console.properties > $INSTALLER_DIR/console.properties.modified +mv $INSTALLER_DIR/console.properties.modified > $INSTALLER_DIR/console.properties # run the installation $INSTALLER_DIR/run-console.sh diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh index 14c2f6de135..b091675d43e 100755 --- a/screening/dist/admin/upgrade.sh +++ b/screening/dist/admin/upgrade.sh @@ -62,7 +62,8 @@ popd > /dev/null # set INSTALL_PATH in the console.properties sed_params='s#^INSTALL_PATH=.*$#INSTALL_PATH='$OPENBIS_INSTALL_DIR'#' -sed -i '' "$sed_params" $INSTALLER_DIR/console.properties +sed "$sed_params" $INSTALLER_DIR/console.properties > $INSTALLER_DIR/console.properties.modified +mv $INSTALLER_DIR/console.properties.modified > $INSTALLER_DIR/console.properties # run the installation $INSTALLER_DIR/run-console.sh -- GitLab