Merge branch 'master' of https://aur.archlinux.org/gogs-git-dev

PKGBUILD

@@ -3,11 +3,11 @@
 
 _pkgname=gogs
 _branch=develop
-_gourl=github.com/gogits/$_pkgname
+_gourl=github.com/gogits
 pkgname=gogs-git-dev
-pkgver=r3874.3df8eb6
+pkgver=r3888.28c03f1
 pkgrel=1
-pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}."
+pkgdesc="Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://gogs.io/"
 license=('MIT')
@@ -19,7 +19,7 @@ optdepends=('sqlite: SQLite support'
             'memcached: MemCached support'
             'openssh: GIT over SSH support'
             'tidb-git: TiDB support')
-makedepends=('go>=1.4' 'git')
+makedepends=('go>=1.4' 'git' 'glide')
 conflicts=('gogs')
 provides=('gogs')
 options=('!strip' '!emptydirs')
@@ -27,41 +27,40 @@ backup=('etc/gogs/app.ini')
 install=gogs.install
 
 source=('gogs.service'
-        "$_pkgname::git+https://${_gourl}.git#branch=${_branch}")
+        "${_pkgname}::git+https://${_gourl}/${_pkgname}.git#branch=${_branch}")
 
 pkgver(){
     GOPATH="$srcdir/build"
-    cd $GOPATH/src/${_gourl}
+    cd "$GOPATH/src/${_gourl}/${_pkgname}"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-
 prepare() {
     GOPATH="$srcdir/build"
-    rm -rf "$GOPATH/src/github.com/gogits"
-    mkdir -p "$GOPATH/src/github.com/gogits"
-    mv  $_pkgname "$GOPATH/src/$_gourl"
+    rm -rf "$GOPATH/src/${_gourl}"
+    mkdir -p "$GOPATH/src/${_gourl}"
+    mv  ${_pkgname} "$GOPATH/src/${_gourl}/${_pkgname}"
+    cd "$GOPATH/src/${_gourl}/${_pkgname}"
+    glide install
 }
 
 build() {
     GOPATH="$srcdir/build"
-    cd $GOPATH/src/${_gourl}
-    go get -x -tags='sqlite pam cert'
+    cd "$GOPATH/src/${_gourl}/${_pkgname}"
     go fix
     go build -x -tags='sqlite pam cert'
 }
 
 package() {
     GOPATH="$srcdir/build"
-    install -Dm0755 "$GOPATH/src/${_gourl}/$_pkgname" "$pkgdir/usr/share/$_pkgname/$_pkgname"
-    cp -r "$GOPATH/src/${_gourl}/conf" "$pkgdir/usr/share/$_pkgname"
+    install -Dm0755 "$GOPATH/src/${_gourl}/${_pkgname}/${_pkgname}" "$pkgdir/usr/share/${_pkgname}/${_pkgname}"
+    cp -r "$GOPATH/src/${_gourl}/${_pkgname}/conf" "$pkgdir/usr/share/${_pkgname}"
     install -dm755 "$pkgdir/usr/share/themes/gogs/default"
-    cp -r "$GOPATH/src/${_gourl}/public" "$pkgdir/usr/share/themes/gogs/default"
-    cp -r "$GOPATH/src/${_gourl}/templates" "$pkgdir/usr/share/themes/gogs/default"
-    install -Dm0644 "$GOPATH/src/${_gourl}/conf/app.ini" "$pkgdir/etc/$_pkgname/app.ini"
+    cp -r "$GOPATH/src/${_gourl}/${_pkgname}/public" "$pkgdir/usr/share/themes/gogs/default"
+    cp -r "$GOPATH/src/${_gourl}/${_pkgname}/templates" "$pkgdir/usr/share/themes/gogs/default"
+    install -Dm0644 "$GOPATH/src/${_gourl}/${_pkgname}/conf/app.ini" "$pkgdir/etc/${_pkgname}/app.ini"
     install -Dm0644 "$srcdir/gogs.service" "$pkgdir/usr/lib/systemd/system/gogs.service"
 }
 
 sha512sums=('2b468bf8208b53a61d7f3f0676b83de36467809ad703c168dcc275b0a0f0490308d9b451ca3fc35824db050f5323a394b239bafebf99c4bc8bcf61db12fab6e1'
             'SKIP')
-

gogs.service

@@ -9,7 +9,7 @@ User=gogs
 Group=gogs
 ExecStart=/usr/share/gogs/gogs web --config /etc/gogs/app.ini
 WorkingDirectory=/srv/gogs
-Environment=USER=gogs HOME=/home/gogs
+Environment=USER=gogs HOME=/srv/gogs
 
 [Install]
 WantedBy=multi-user.target