From 5632e88ef614b838bcca2966436b8b8c6e1cf28c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 17 Feb 2016 16:48:00 +0000 Subject: [PATCH] checkout after go get --- src/freedombone | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/freedombone b/src/freedombone index 640661ff..e9fe85ad 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1424,15 +1424,15 @@ function set_default_onion_domains { if [ $FULLBLOG_DOMAIN_NAME ]; then FULLBLOG_DOMAIN_NAME='blog.local' fi - if [ $GIT_DOMAIN_NAME ]; then - GIT_DOMAIN_NAME='git.local' - fi if [ $WIKI_DOMAIN_NAME ]; then WIKI_DOMAIN_NAME='wiki.local' fi if [ $DEFAULT_DOMAIN_NAME ]; then DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local" fi + if [ $GIT_DOMAIN_NAME ]; then + GIT_DOMAIN_NAME='git.local' + fi } function set_repo_commit { @@ -6685,6 +6685,10 @@ function install_gogs { exit 85482 fi cd $GOPATH/src/github.com/gogits/gogs + + # install + go get -u ./... + git checkout $GOGS_COMMIT -b $GOGS_COMMIT if ! grep -q "Gogs commit" $COMPLETION_FILE; then echo "Gogs commit:$GOGS_COMMIT" >> $COMPLETION_FILE @@ -6692,9 +6696,7 @@ function install_gogs { sed -i "s/Gogs commit.*/Gogs commit:$GOGS_COMMIT/g" $COMPLETION_FILE fi - # install - go get -u ./... - go build + go build if [ ! "$?" = "0" ]; then echo $'install_gogs: go build failed' exit 546750