2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-20 02:00:24 +00:00

Need -e option for echo to print newline

This commit is contained in:
Victor Hu
2019-06-03 11:42:26 -04:00
parent 2fbb4ec269
commit 651d853ef3

View File

@@ -6,11 +6,11 @@ function runcmd(){
result=`$*`
if [[ $? -eq 0 ]];then
echo $result;
echo "Run command $*....[Succeed]\n";
echo -e "Run command $*....[Succeed]\n";
return 0;
else
echo $result;
echo "Run command $*... [Failed]\n";
echo -e "Run command $*... [Failed]\n";
return 1;
fi
}
@@ -23,7 +23,7 @@ masternet=`ifconfig | awk "BEGIN{RS=\"\"}/\<$masterip\>/{print \$1}"|head -n 1
net2=`netstat -i -a|grep -v Kernel|grep -v Iface |grep -v lo|grep -v $masternet|head -n 1|awk '{print $1}'`;
net2ip="";
if [[ -z $net2 ]];then
echo "There is no second network,could not verify the test"
echo "There is no second network, could not verify the test"
return 1;
else
net2ipstring=`ifconfig $net2 |grep inet|grep -v inet6`;
@@ -35,7 +35,7 @@ net2ip="";
else
net2ip=0.0.0.0;
fi
echo "The original net2 ip is $net2ip"
echo "The original net2 IP is $net2ip"
cmd="ifconfig $net2 60.3.3.3";
runcmd $cmd;
cmd="makenetworks";