shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'bug-389'

Browse Source
This commit is contained in:
Ruben S. Montero 2010-11-23 14:20:17 +01:00
commit 6053ec837e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tm_mad/tm_common.sh
View File

@ -39,6 +39,12 @@ SSH=/usr/bin/ssh
SUDO=/usr/bin/sudo
WGET=/usr/bin/wget
if [ "x$(uname -s)" = "xLinux" ]; then
SED="$SED -r"
else
SED="/usr/bin/sed -E"
fi
function get_vmdir
{
VMDIR=`grep '^VM_DIR=' $ONE_LOCAL_VAR/config | cut -d= -f2`
@ -49,7 +55,7 @@ function get_vmdir
# /some//path///somewhere/ -> /some/path/somewhere
function fix_dir_slashes
{
dirname "$1/file" | sed -E 's/\/+/\//g'
dirname "$1/file" | $SED 's/\/+/\//g'
}
function fix_var_slashes
@ -118,13 +124,13 @@ function error_message
# Gets the host from an argument
function arg_host
{
echo $1 | $SED -e 's/^\([^:]*\):.*$/\1/'
echo $1 | $SED 's/^\([^:]*\):.*$/\1/'
}
# Gets the path from an argument
function arg_path
{
echo $1 | $SED -e 's/^[^:]*:\(.*\)$/\1/'
echo $1 | $SED 's/^[^:]*:\(.*\)$/\1/'
}
# Executes a command, if it fails return error message and exits