updated packaging and installation

4 files changed, 64 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9111209cee1..defe3da26cd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,20 @@
 # Generated by mksrcinfo v8
-# Thu Sep  6 19:20:20 UTC 2018
+# Tue Oct  2 14:42:14 UTC 2018
 pkgbase = signal-web-gateway-git
 	pkgdesc = Use Signal as a web gateway for other apps (reporting, monitoring, etc.)
 	pkgver = 0.1
 	pkgrel = 1
 	url = https://gitlab.com/morph027/signal-web-gateway
+	install = signal-web-gateway.install
 	arch = x86_64
 	license = MIT
 	makedepends = go
+	provides = signal-web-gateway
+	conflicts = signal-web-gateway
+	source = git+https://github.com/morph027/textsecure.git
+	source = signal-web-gateway.service
+	sha512sums = SKIP
+	sha512sums = aa0c5e8eae19bc8da8374827de993b5dace5e9d84a02a51f01903a99a55816eab448905e8d8b552f28b2cfd8e0f2e263839b0b12b58df477c3910d6f73d961a8
 
 pkgname = signal-web-gateway-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d199645544be..468f3f81a5c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,20 +10,40 @@ arch=('x86_64')
 url="https://gitlab.com/morph027/signal-web-gateway"
 license=('MIT')
 makedepends=('go')
-_gourl=github.com/morph027/textsecure
+source=('git+https://github.com/morph027/textsecure.git'
+	'signal-web-gateway.service')
+sha512sums=('SKIP'
+	    'aa0c5e8eae19bc8da8374827de993b5dace5e9d84a02a51f01903a99a55816eab448905e8d8b552f28b2cfd8e0f2e263839b0b12b58df477c3910d6f73d961a8')
+install="signal-web-gateway.install"
+conflicts=("signal-web-gateway")
+provides=("signal-web-gateway")
+
+#pkgver() {
+#  cd "textsecure"
+#  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+#}
+
+prepare() {
+  export GOPATH="${srcdir}"
+  mkdir -p "${srcdir}/src/github.com/morph027"
+  mv "${srcdir}/textsecure" "${srcdir}/src/github.com/morph027/textsecure"
+  cd "${srcdir}/src/github.com/morph027/textsecure"
+  go get -v
+  go get -v github.com/sirupsen/logrus
+}
 
 build() {
-  GOPATH="$srcdir" go get -v ${_gourl}/... # -fix -x
+  export GOPATH="${srcdir}"
+  cd "${srcdir}/src/github.com/morph027/textsecure/cmd/textsecure"
+  go build -v
 }
 
 package() {
-  install -Dm755 "$srcdir/bin/azure-storage-azcopy" "$pkgdir/usr/bin/azcopy"
-
-  # Package license (if available)
-  for f in LICENSE COPYING LICENSE.* COPYING.*; do
-    if [ -e "$srcdir/src/$_gourl/$f" ]; then
-      install -Dm644 "$srcdir/src/$_gourl/$f" \
-        "$pkgdir/usr/share/licenses/$pkgname/$f"
-    fi
-  done
+  install -Dm755 "${srcdir}/src/github.com/morph027/textsecure/cmd/textsecure/textsecure" "${pkgdir}/usr/bin/signal-web-gateway"
+  install -Dm644 "${srcdir}/signal-web-gateway.service" "${pkgdir}/usr/lib/systemd/system/signal-web-gateway.service"
+  install -D "${srcdir}/src/github.com/morph027/textsecure/COPYING" "${pkgdir}/usr/share/licenses/signal-web-gateway/LICENSE"
+  mkdir -p "${pkgdir}/var/lib/signal-web-gateway"
+  cp -r "${srcdir}/src/github.com/morph027/textsecure/cmd/textsecure/.config" "${pkgdir}/var/lib/signal-web-gateway/.config"
+  mkdir -p "${pkgdir}/etc/webapps/signal-web-gateway"
+  ln -s "/var/lib/signal-web-gateway/.config/config.yml" "${pkgdir}/etc/webapps/signal-web-gateway/"
 }
diff --git a/signal-web-gateway.install b/signal-web-gateway.install
new file mode 100644
index 000000000000..7a16cac08e94
--- /dev/null
+++ b/signal-web-gateway.install
@@ -0,0 +1,10 @@
+post_install() {
+  getent passwd signal > /dev/null || useradd -d /var/lib/signal-web-gateway signal > /dev/null
+  getent group signal > /dev/null || groupadd -r signal > /dev/null
+  chown -R signal:signal /var/lib/signal-web-gateway
+}
+ 
+post_remove() {
+   userdel -rf signal
+   groupdel signal
+}
diff --git a/signal-web-gateway.service b/signal-web-gateway.service
new file mode 100644
index 000000000000..ec7c8e9934c5
--- /dev/null
+++ b/signal-web-gateway.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=signal-web-gateway daemon
+After=network.target
+
+[Service]
+PIDFile=/var/lib/signal-web-gateway/pid
+User=signal
+Group=signal
+RuntimeDirectory=signal-web-gateway
+WorkingDirectory=/var/lib/signal-web-gateway/
+ExecStart=/usr/bin/signal-web-gateway -gateway
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target