Commit 743e8a84 authored by tywldx's avatar tywldx

fix

parent 7e181293
...@@ -3,34 +3,16 @@ project=$1 ...@@ -3,34 +3,16 @@ project=$1
config_server=$2 config_server=$2
project_path=$3 project_path=$3
params=`node $config_server/get_project_config.js -name $project -attr desc/config_file/command/node_version` params=`node $config_server/get_project_config.js -name $project -attr desc/config_file`
params_arry=(${params//|/ }) params_arry=(${params//|/ })
desc=${params_arry[0]} desc=${params_arry[0]}
config_file=${params_arry[1]} config_file=${params_arry[1]}
command=${params_arry[2]//\^/ }
node_version=${params_arry[3]}
sh $config_server/show_info.sh $project BUILD $desc `hostname` sh $config_server/show_info.sh $project BUILD $desc `hostname`
# 第一步 将nginx项目的所有文件进行打包
cd $project_path/$project
if [ "$node_version" = "node4" ] ;then cd $project_path/$project
echo "----node-V4---${node4_path}/npm install" setup_path_temp=`find ./ -name "setup.py"`
${node4_path}/npm install python ${setup_path_temp} install
else #第四步 关联配置文件
npm --registry http://172.16.3.15:4873 install rm -rf $config_file
fi ln -s $config_path/python/$project.* $config_file
bower_json=`find ./ -maxdepth 1 -name "bower.json"` \ No newline at end of file
if [ -n "$bower_json" ];then
echo "bower install --allow-root"
bower install --allow-root
else
echo "don't have bower.json"
fi
$command
# 第二步 不关机使得nginx生效
nginx -t; nginx -s reload
\ No newline at end of file
...@@ -3,16 +3,34 @@ project=$1 ...@@ -3,16 +3,34 @@ project=$1
config_server=$2 config_server=$2
project_path=$3 project_path=$3
params=`node $config_server/get_project_config.js -name $project -attr desc/config_file` params=`node $config_server/get_project_config.js -name $project -attr desc/config_file/command/node_version`
params_arry=(${params//|/ }) params_arry=(${params//|/ })
desc=${params_arry[0]} desc=${params_arry[0]}
config_file=${params_arry[1]} config_file=${params_arry[1]}
command=${params_arry[2]//\^/ }
node_version=${params_arry[3]}
sh $config_server/show_info.sh $project BUILD $desc `hostname`
sh $config_server/show_info.sh $project BUILD $desc `hostname`
# 第一步 将nginx项目的所有文件进行打包
cd $project_path/$project cd $project_path/$project
setup_path_temp=`find ./ -name "setup.py"`
python ${setup_path_temp} install if [ "$node_version" = "node4" ] ;then
#第四步 关联配置文件 echo "----node-V4---${node4_path}/npm install"
rm -rf $config_file ${node4_path}/npm install
ln -s $config_path/python/$project.* $config_file else
\ No newline at end of file npm --registry http://172.16.3.15:4873 install
fi
bower_json=`find ./ -maxdepth 1 -name "bower.json"`
if [ -n "$bower_json" ];then
echo "bower install --allow-root"
bower install --allow-root
else
echo "don't have bower.json"
fi
$command
# 第二步 不关机使得nginx生效
nginx -t; nginx -s reload
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment