pull/109/head
midoks 3 years ago
parent 826707c91d
commit 1f7388b575
  1. 4
      plugins/gogs/hook/commit.tpl
  2. 4
      plugins/gogs/index.py

@ -2,7 +2,7 @@
echo `date`
GITADDR="{$GITROOTURL}/{$USERNAME}/{$PROJECT}"
GITADDR="{$GITROOTURL}/{$USERNAME}/{$PROJECT}.git"
GIT_SDIR="{$CODE_DIR}"
GIT_USER_DIR="${GIT_SDIR}/{$USERNAME}"
@ -24,7 +24,7 @@ cd $GIT_PROJECT_DIR && git pull
# cd $GIT_PROJECT_DIR && env -i git pull origin master
#更新的目的地址
WEB_PATH={$WEB_ROOT}/{$USERNAME}/{$PROJECT}
mkdir -p $WEB_PATH

@ -593,8 +593,8 @@ def projectScriptLoad():
cc_content = mw.readFile(commit_tpl)
sshUrl = 'http://127.0.0.1:' + getHttpPort()
cc_content = cc_content.replace('{$GITROOTURL}', sshUrl)
gitPath = getRootPath()
cc_content = cc_content.replace('{$GITROOTURL}', gitPath)
cc_content = cc_content.replace('{$CODE_DIR}', codeDir)
cc_content = cc_content.replace('{$USERNAME}', user)
cc_content = cc_content.replace('{$PROJECT}', args['name'])

Loading…
Cancel
Save