Merge branch 'develop' into feature-44-dedicated-drb
This commit is contained in:
@@ -1450,7 +1450,6 @@ for oai in oai_list:
|
|||||||
#cmd = cmd + 'mkdir -p ' + logdir + '\n'
|
#cmd = cmd + 'mkdir -p ' + logdir + '\n'
|
||||||
cmd = cmd + 'cd '+ logdir + '\n'
|
cmd = cmd + 'cd '+ logdir + '\n'
|
||||||
cmd = cmd + 'sudo apt-get install -y git \n'
|
cmd = cmd + 'sudo apt-get install -y git \n'
|
||||||
cmd = cmd + 'git config --global http.sslVerify false \n'
|
|
||||||
cmd = cmd + 'chmod 700 ' + logdir + '/git-retry.sh \n'
|
cmd = cmd + 'chmod 700 ' + logdir + '/git-retry.sh \n'
|
||||||
cmd = cmd + logdir + '/git-retry.sh clone '+ GitOAI5GRepo +' \n'
|
cmd = cmd + logdir + '/git-retry.sh clone '+ GitOAI5GRepo +' \n'
|
||||||
cmd = cmd + logdir + '/git-retry.sh clone '+ GitOpenaircnRepo + ' \n'
|
cmd = cmd + logdir + '/git-retry.sh clone '+ GitOpenaircnRepo + ' \n'
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
#$1 programs to be killed and checked
|
#$1 programs to be killed and checked
|
||||||
ps -aux |grep -E -i $1| awk \'{print $2}\' | sudo xargs kill -9
|
ps -aux |grep -E -i $1| awk '{print $2}' | sudo xargs kill -9
|
||||||
|
|
||||||
var=`ps -aux |grep -E -i $1`
|
var=`ps -aux |grep -E -i $1`
|
||||||
echo $var
|
echo $var
|
||||||
|
|||||||
Reference in New Issue
Block a user