wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-08 12:55:05 +08:00
parent 67e92b6576 2fdd59e379
commit 740d820be9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/common/utils/UpdateUtil.java
View File

@ -87,7 +87,8 @@ public class UpdateUtil {
* @param active 启动程序的配置文件 * @param active 启动程序的配置文件
*/ */
private void execUpdate(String updateFilePath, String active) { private void execUpdate(String updateFilePath, String active) {
String cmd = String.format("cd %s && sh update.sh %s %s", pwd, pwd, updateFilePath, "renren-admin", active); String[] cmd = {"/bin/sh", "-c", String.format("cd %s && sh update.sh %s %s %s %s", pwd, pwd, updateFilePath, "renren-admin", active)};
// String cmd = String.format("cd %s && sh update.sh %s %s", pwd, pwd, updateFilePath, "renren-admin", active);
logger.info("执行指令：{}", cmd); logger.info("执行指令：{}", cmd);
logger.info(RuntimeUtil.execForStr(cmd)); logger.info(RuntimeUtil.execForStr(cmd));
} }

2
renren-admin/src/main/resources/assembly/bin/update.sh
View File

@ -98,7 +98,7 @@ if [ -f "${APP_DIR}/tmp/${APP_NAME}/${APP_NAME}.jar" ]; then
\cp -rf ${APP_DIR}/tmp/${APP_NAME}/${APP_NAME}.jar ${APP_DIR}/ \cp -rf ${APP_DIR}/tmp/${APP_NAME}/${APP_NAME}.jar ${APP_DIR}/
echo "${APP_NAME} 项目更新完成" echo "${APP_NAME} 项目更新完成"
else else
echo "${APP_NAME} 项目程序不存在" echo "${APP_NAME} 项目程序不存在 ${APP_DIR}/tmp/${APP_NAME}/${APP_NAME}.jar"
fi fi
# 移除更新包以及更新的项目 # 移除更新包以及更新的项目