Merge pull request #1 from WeBankFinTech/master

liuyou2 · web-flow · commit d013db58d227 · 2019-12-05T22:13:11.000+08:00
pull code
diff --git a/bin/install.sh b/bin/install.sh
@@ -299,7 +299,7 @@ fi
 echo "$APPJOINTNAME-step2:copy install package"
 scp  -P $SSH_PORT  $workDir/share/appjoints/$APPJOINTNAME/*.zip  $SERVER_IP:$SERVER_HOME/$APPJOINTPARENT
 isSuccess "copy  ${APPJOINTNAME}.zip"
-ssh  -p $SSH_PORT  $SERVER_IP "cd $SERVER_HOME/$APPJOINTPARENT/;unzip -o dss-$APPJOINTNAME-appjoint.zip > /dev/null;rm -rf dss-$APPJOINTNAME-appjoint.zip"
+ssh  -p $SSH_PORT  $SERVER_IP "cd $SERVER_HOME/$APPJOINTPARENT/;unzip -o dss-*-appjoint.zip > /dev/null;rm -rf dss-*-appjoint.zip"
 isSuccess "install  ${APPJOINTNAME}.zip"
 }
 ##function end

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ fi`
`299`	`299`	`echo "$APPJOINTNAME-step2:copy install package"`
`300`	`300`	`scp -P $SSH_PORT $workDir/share/appjoints/$APPJOINTNAME/*.zip $SERVER_IP:$SERVER_HOME/$APPJOINTPARENT`
`301`	`301`	`isSuccess "copy ${APPJOINTNAME}.zip"`
`302`		`-ssh -p $SSH_PORT $SERVER_IP "cd $SERVER_HOME/$APPJOINTPARENT/;unzip -o dss-$APPJOINTNAME-appjoint.zip > /dev/null;rm -rf dss-$APPJOINTNAME-appjoint.zip"`
	`302`	`+ssh -p $SSH_PORT $SERVER_IP "cd $SERVER_HOME/$APPJOINTPARENT/;unzip -o dss--appjoint.zip > /dev/null;rm -rf dss--appjoint.zip"`
`303`	`303`	`isSuccess "install ${APPJOINTNAME}.zip"`
`304`	`304`	`}`
`305`	`305`	`##function end`