Merge branch '0.0.13-v2'

3 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c13da372141..5fd06616ca2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = roam-research
 	pkgdesc = A note-taking tool for networked thought
 	pkgver = 0.0.13
-	pkgrel = 1
+	pkgrel = 2
 	url = https://roamresearch.com/
 	arch = any
 	license = custom
 	source = roam-research-0.0.13.tgz::https://roam-electron-deploy.s3.us-east-2.amazonaws.com/roam-research_0.0.13_amd64.deb
+	source = LICENSE
 	md5sums = 1bd0ffd8618975d601bb93c0ae1741af
+	md5sums = 34234c4e196ceeaf00e4ee7f29b9fb63
 
 pkgname = roam-research
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..3ceb684fe1d6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,2 @@
+Terms and Conditions: https://roamresearch.com/#/app/help/page/MHRK1dgTE
+Privacy Policy: https://roamresearch.com/#/app/help/page/bnQcAUM0i
diff --git a/PKGBUILD b/PKGBUILD
index 37eb2abd3431..762ee526a35a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,20 @@
 _pkgname=roam-research
 pkgname=roam-research
 pkgver=0.0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A note-taking tool for networked thought"
 arch=('any')
 url="https://roamresearch.com/"
 license=('custom')
 depends=()
-source=("$_pkgname-$pkgver.tgz::https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${_pkgname}_${pkgver}_amd64.deb")
-md5sums=('1bd0ffd8618975d601bb93c0ae1741af')
+source=(
+  "$_pkgname-$pkgver.tgz::https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${_pkgname}_${pkgver}_amd64.deb"
+  "LICENSE"
+)
+md5sums=(
+  '1bd0ffd8618975d601bb93c0ae1741af'
+  '34234c4e196ceeaf00e4ee7f29b9fb63'
+)
 
 prepare() {
   tar -xvf data.tar.xz
@@ -19,13 +25,24 @@ prepare() {
 package() {
   cd "$srcdir"
 
+  # Making paths work with a space is error-prone, so let's replace with a simpler kebab-case directory
   sed -i "s/\/opt\/Roam Research/\/opt\/$_pkgname/" usr/share/applications/roam-research.desktop
 
-  install -d "$pkgdir"/{opt/$_pkgname,usr/share}
+  # Install all the things
+  install -d "$pkgdir"/{opt/$_pkgname,usr/share,usr/bin}
   cp -r opt/Roam\ Research/* -t "$pkgdir"/opt/$_pkgname
   cp -r usr/share/* -t "$pkgdir"/usr/share
+
+  # Make the desktop icons available
+  # (not sure why they're under 0x0? Where is that used?)
   install -d "$pkgdir"/usr/share/icons/hicolor/1024x1024
   cp -r usr/share/icons/hicolor/0x0/* -t "$pkgdir"/usr/share/icons/hicolor/1024x1024
   install -d "$pkgdir"/usr/share/pixmaps
   install -D usr/share/icons/hicolor/0x0/apps/roam-research.png -t "$pkgdir"/usr/share/pixmaps
+
+  # Make the binary available in the $PATH
+  ln -s /opt/${_pkgname}/${_pkgname} "${pkgdir}"/usr/bin/${_pkgname}
+
+  # Add a license that links to the Terms and Conditions and Privacy Policy from https://roamresearch.com
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }