From a2514904cba3c89630fd76af38f672379d7c3326 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Fri, 4 Nov 2016 13:44:23 +0100 Subject: [PATCH 1/2] Rename gogs.go to main.go Signed-off-by: Matthias Loibl --- gogs.go => main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename gogs.go => main.go (99%) diff --git a/gogs.go b/main.go similarity index 99% rename from gogs.go rename to main.go index 0235a20883..43eb8fdb72 100644 --- a/gogs.go +++ b/main.go @@ -11,10 +11,9 @@ import ( "os" "runtime" - "github.com/urfave/cli" - "github.com/go-gitea/gitea/cmd" "github.com/go-gitea/gitea/modules/setting" + "github.com/urfave/cli" ) const APP_VER = "0.9.99.0915" From f01d927efbd1bcbb6c9312281c3c16179360b084 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Fri, 4 Nov 2016 13:49:10 +0100 Subject: [PATCH 2/2] Rename all occurrences of gogs.go Signed-off-by: Matthias Loibl --- Makefile | 2 +- scripts/build.sh | 3 ++- scripts/build_freebsd.sh | 5 +++-- scripts/build_linux64.sh | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b3ee101959..b75732f2e5 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ check: test dist: release govet: - $(GOVET) gogs.go + $(GOVET) main.go $(GOVET) models modules routers build: $(GENERATED) diff --git a/scripts/build.sh b/scripts/build.sh index cf127c2aee..1149a805ae 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,9 +1,10 @@ +#!/usr/bin/env bash outPath=./output rm -rf $outPath mkdir $outPath -go build ../gogs.go +go build ../main.go -o gitea PLATFORM=`uname | cut -d _ -f 1` if [ $PLATFORM = "MINGW32" ] || [ $PLATFORM = "MINGW64" ] || [ $PLATFORM = "CYGWIN" ]; then GOGS_EXE=gogs.exe diff --git a/scripts/build_freebsd.sh b/scripts/build_freebsd.sh index b53c6ac0d5..2c995bae21 100755 --- a/scripts/build_freebsd.sh +++ b/scripts/build_freebsd.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash outPlattform=freebsd outArch=amd64 outPath=./output_$outPlattform_$outArch @@ -5,7 +6,7 @@ outPath=./output_$outPlattform_$outArch rm -rf $outPath mkdir $outPath -CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../gogs.go +CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../main.go -o gitea chmod +x gogs mv gogs $outPath/ @@ -24,4 +25,4 @@ cp ../README_ZH.md $outPath/ cp start.bat $outPath/ cp start.sh $outPath/ cp ../wercker.yml $outPath/ -cp mysql.sql $outPath/ \ No newline at end of file +cp mysql.sql $outPath/ diff --git a/scripts/build_linux64.sh b/scripts/build_linux64.sh index 528fc54cf0..6a3bdb65bc 100755 --- a/scripts/build_linux64.sh +++ b/scripts/build_linux64.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash outPlattform=linux outArch=amd64 outPath=./output_$outPlattform_$outArch @@ -5,7 +6,7 @@ outPath=./output_$outPlattform_$outArch rm -rf $outPath mkdir $outPath -CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../gogs.go +CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../main.go -o gitea chmod +x gogs mv gogs $outPath/ @@ -24,4 +25,4 @@ cp ../README_ZH.md $outPath/ cp start.bat $outPath/ cp start.sh $outPath/ cp ../wercker.yml $outPath/ -cp mysql.sql $outPath/ \ No newline at end of file +cp mysql.sql $outPath/