openbazaard-git: remove opt symlink

5 files changed, 24 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2be21799924e..a9137dcbc3e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,6 +3,7 @@ pkgbase = openbazaard-git
 	pkgver = v0.11.0.rc2.r1.g8540a8a1
 	pkgrel = 1
 	url = http://openbazaar.org
+	install = openbazaard.install
 	arch = arm
 	arch = armv6h
 	arch = armv7h
@@ -20,8 +21,8 @@ pkgbase = openbazaard-git
 	source = openbazaard.service
 	source = openbazaard.conf
 	md5sums = SKIP
-	md5sums = a6ee246f8be0b85697eca8d9a86014cd
-	md5sums = 93ff9255cb400c6748f6cb45a5456962
+	md5sums = b0193c5364076ce7b112f13edf995ac1
+	md5sums = 9fd31f8bc5b6ccc21a52fc1b58fdb9d6
 
 pkgname = openbazaard-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 341786299413..ae311be7f059 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ arch=(arm armv6h armv7h aarch64 i686 x86_64)
 url="http://openbazaar.org"
 license=('MIT')
 depends=()
-#install=${_pkgname}.install
+install=${_pkgname}.install
 makedepends=(go git upx)
 conflicts=('openbazaard')
 options=('strip' 'upx')
@@ -38,29 +38,25 @@ pkgver() {
 
 build(){
   cd $srcdir
-  export GOPATH="$PWD"/.gopath
-  mkdir -p "$GOPATH"/src/${_user}
-  ln -sf "$PWD"/${_repo} "$GOPATH"/src/${_user}/${_repo}
+  export GOPATH=$PWD/.gopath
+  mkdir -p $GOPATH/src/${_user}
+  ln -sf $PWD/${_repo} $GOPATH/src/${_user}/${_repo}
 
-  cd "$GOPATH"/src/${_user}/${_repo}
+  cd $GOPATH/src/${_user}/${_repo}
   go get -v
 }
 
 package() {
-  export PATH="$PATH":"$PWD"/.gopath/bin
-  cd "$GOPATH"/src/${_user}/${_repo}
+  export PATH=$PATH:$PWD/.gopath/bin
+  cd $GOPATH/src/${_user}/${_repo}
 
   go build
   
-  install -Dm755 "$GOPATH"/bin/${_repo} $pkgdir/usr/bin/${_pkgname}
-
+  install -Dm755 $GOPATH/bin/${_repo} $pkgdir/usr/bin/${_pkgname}
   install -Dm644 $srcdir/${_pkgname}.service $pkgdir/usr/lib/systemd/system/${_pkgname}.service
-  install -D -m644 "${srcdir}/${_pkgname}".conf "$pkgdir/etc/conf.d/${_pkgname}"
-  
-  install -dm755 $pkgdir/opt/openbazaar-go/
-  ln -sr /usr/bin/${_pkgname} $pkgdir/opt/openbazaar-go/openbazaard
+  install -D -m644 $srcdir/${_pkgname}.conf $pkgdir/etc/conf.d/${_pkgname}
 }
 
 md5sums=('SKIP'
-         'a6ee246f8be0b85697eca8d9a86014cd'
-         '93ff9255cb400c6748f6cb45a5456962')
+         'b0193c5364076ce7b112f13edf995ac1'
+         '9fd31f8bc5b6ccc21a52fc1b58fdb9d6')
diff --git a/openbazaard.conf b/openbazaard.conf
index fb880b4523df..2795ce382ef0 100644
--- a/openbazaard.conf
+++ b/openbazaard.conf
@@ -1 +1 @@
-OB_ARGS="-d /var/lib/openbazaard"
+OB_ARGS="-d /var/lib/openbazaar"
diff --git a/openbazaard.install b/openbazaard.install
new file mode 100644
index 000000000000..ea19a382cdc8
--- /dev/null
+++ b/openbazaard.install
@@ -0,0 +1,8 @@
+post_upgrade() {
+cat << EOF
+Please backup your store directory located at:
+	/var/lib/openbazaard/.openbazaar2.0
+This package now use a new directory located at:
+	/var/lib/openbazaar
+EOF
+}
diff --git a/openbazaard.service b/openbazaard.service
index 5396712122d3..6cac2171c82f 100644
--- a/openbazaard.service
+++ b/openbazaard.service
@@ -7,7 +7,7 @@ Type=simple
 User=openbazaar
 DynamicUser=yes
 EnvironmentFile=/etc/conf.d/openbazaard
-StateDirectory=openbazaard
+StateDirectory=openbazaar
 ExecStart=/usr/bin/openbazaard start $OB_ARGS
 ExecStop=/usr/bin/openbazaard stop
 ExecReload=/usr/bin/openbazaard restart