diff options
| author | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
|---|---|---|
| committer | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
| commit | ba1270df2d3d835b397317f133963e7b517242f1 (patch) | |
| tree | 1265a142a1fd9951d30ae11648e7fbfb5806e594 /scripts/build.sh | |
| parent | ba0feadc34400cb91ff23f66096884d862651cdd (diff) | |
| parent | 405ee14711ab946bd709ec28a526890c40cbc03b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/app.ini
Diffstat (limited to 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 0195947d..03b8077b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,22 +1,21 @@ rm -rf output mkdir output -go build +go build ../gogs.go chmod +x gogs mv gogs ./output/ -cp -r ./conf/ ./output/conf/ -cp -r ./custom/ ./output/custom/ +cp -r ../conf/ ./output/conf/ +cp -r ../custom/ ./output/custom/ cp -r ./dockerfiles/ ./output/dockerfiles/ -cp -r ./public/ ./output/public/ -cp -r ./templates/ ./output/templates/ -cp bee.json ./output/ -cp cert.pem ./output/ -cp CONTRIBUTING.md ./output/ +cp -r ../public/ ./output/public/ +cp -r ../templates/ ./output/templates/ +cp ../cert.pem ./output/ +cp ../CONTRIBUTING.md ./output/ cp gogs_supervisord.sh ./output/ -cp key.pem ./output/ -cp LICENSE ./output/ -cp README.md ./output/ -cp README_ZH.md ./output/ -cp rpp.ini ./output/ +cp ../key.pem ./output/ +cp ../LICENSE ./output/ +cp ../README.md ./output/ +cp ../README_ZH.md ./output/ cp start.bat ./output/ cp start.sh ./output/ -cp wercker.yml ./output/ +cp ../wercker.yml ./output/ +cp mysql.sql ./output/ |