|
@@ -224,6 +224,8 @@ GIT_DOMAIN_REPO="https://github.com/gogits/gogs"
|
224
|
224
|
GIT_ADMIN_PASSWORD=
|
225
|
225
|
GOGS_COMMIT='efea642d6cf419c9587d44b95ff2bc04e89f7bfe'
|
226
|
226
|
GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"
|
|
227
|
+GVM_REPO="https://github.com/moovweb/gvm"
|
|
228
|
+GVM_COMMIT='25ea8ae158e2861c92e2b22c458e60840157832f'
|
227
|
229
|
|
228
|
230
|
# Domain name for Owncloud installation
|
229
|
231
|
OWNCLOUD_DOMAIN_NAME=
|
|
@@ -6636,6 +6638,55 @@ function install_owncloud {
|
6636
|
6638
|
fi
|
6637
|
6639
|
}
|
6638
|
6640
|
|
|
6641
|
+function upgrade_golang {
|
|
6642
|
+ if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
|
6643
|
+ return
|
|
6644
|
+ fi
|
|
6645
|
+
|
|
6646
|
+ # NOTE: this is annoyingly hacky and going in the opposite
|
|
6647
|
+ # direction of a pure blend, but it's necessary if you want
|
|
6648
|
+ # to run the latest version of gogs
|
|
6649
|
+
|
|
6650
|
+ # update to the next commit
|
|
6651
|
+ set_repo_commit $INSTALL_DIR/gvm "gvm commit" "$GVM_COMMIT" $GVM_REPO
|
|
6652
|
+
|
|
6653
|
+ if grep -Fxq "upgrade_golang" $COMPLETION_FILE; then
|
|
6654
|
+ return
|
|
6655
|
+ fi
|
|
6656
|
+
|
|
6657
|
+ apt-get -y install curl git mercurial make binutils bison gcc build-essential
|
|
6658
|
+ if [ ! -d $INSTALL_DIR ]; then
|
|
6659
|
+ mkdir $INSTALL_DIR
|
|
6660
|
+ fi
|
|
6661
|
+ cd $INSTALL_DIR
|
|
6662
|
+ git_clone $GVM_REPO gvm
|
|
6663
|
+ cd $INSTALL_DIR/gvm
|
|
6664
|
+ git checkout $GVM_COMMIT -b $GVM_COMMIT
|
|
6665
|
+ if [ ! -f binscripts/gvm-installer ]; then
|
|
6666
|
+ echo $'gvm installer not found'
|
|
6667
|
+ fi
|
|
6668
|
+ chmod +x binscripts/gvm-installer
|
|
6669
|
+ ./binscripts/gvm-installer
|
|
6670
|
+ [[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
|
|
6671
|
+ gvm install go1.4
|
|
6672
|
+ gvm use go1.4
|
|
6673
|
+ export GOROOT_BOOTSTRAP=$GOROOT
|
|
6674
|
+ gvm install go1.5
|
|
6675
|
+ if [ ! "$?" = "0" ]; then
|
|
6676
|
+ echo $'Unable to upgrade golang'
|
|
6677
|
+ exit 529252
|
|
6678
|
+ fi
|
|
6679
|
+ gvm use go1.5
|
|
6680
|
+
|
|
6681
|
+ if ! grep -q "gvm commit" $COMPLETION_FILE; then
|
|
6682
|
+ echo "gvm commit:$GVM_COMMIT" >> $COMPLETION_FILE
|
|
6683
|
+ else
|
|
6684
|
+ sed -i "s/gvm commit.*/gvm commit:$GVM_COMMIT/g" $COMPLETION_FILE
|
|
6685
|
+ fi
|
|
6686
|
+
|
|
6687
|
+ echo 'upgrade_golang' >> $COMPLETION_FILE
|
|
6688
|
+}
|
|
6689
|
+
|
6639
|
6690
|
function install_gogs {
|
6640
|
6691
|
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
6641
|
6692
|
return
|
|
@@ -6696,7 +6747,7 @@ function install_gogs {
|
6696
|
6747
|
sed -i "s/Gogs commit.*/Gogs commit:$GOGS_COMMIT/g" $COMPLETION_FILE
|
6697
|
6748
|
fi
|
6698
|
6749
|
|
6699
|
|
- go build
|
|
6750
|
+ go build
|
6700
|
6751
|
if [ ! "$?" = "0" ]; then
|
6701
|
6752
|
echo $'install_gogs: go build failed'
|
6702
|
6753
|
exit 546750
|
|
@@ -10381,7 +10432,8 @@ configure_firewall_for_web_server
|
10381
|
10432
|
install_owncloud
|
10382
|
10433
|
install_owncloud_music_app
|
10383
|
10434
|
configure_owncloud_onion_site
|
10384
|
|
-install_gogs
|
|
10435
|
+#upgrade_golang
|
|
10436
|
+#install_gogs
|
10385
|
10437
|
install_xmpp
|
10386
|
10438
|
install_tox_node
|
10387
|
10439
|
install_tox_client
|