Fixed installation location of new kernels

3 files changed, 33 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 285e1fba8adc..ca9d7b417ab2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-remote_ikernel
 	pkgdesc = Remote kernel setup for Jupyter
 	pkgver = 0.4.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/tdaff/remote_ikernel
 	arch = any
 	license = BSD
@@ -10,8 +10,10 @@ pkgbase = python-remote_ikernel
 	depends = jupyter-notebook
 	source = https://files.pythonhosted.org/packages/source/r/remote_ikernel/remote_ikernel-0.4.6.tar.gz
 	source = host.patch
+	source = usrfix.patch
 	sha256sums = 740b80a57fa1af40cadef541c5a4eb293675b504092ecf00c57dd2f0011bd840
 	sha256sums = bf209f55f6dea633e09a7f809ae9e1aa7c0d9fdfd0d026d8cf900b7a6d8cf6af
+	sha256sums = f8c57fc530c8ba51f8baa27bb3c4e9e1ad9bc84cf841a5ebf04ffed58e58ceb2
 
 pkgname = python-remote_ikernel
 
diff --git a/PKGBUILD b/PKGBUILD
index 95b13d7c2cef..b79626eee581 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=python-remote_ikernel
 _name=${pkgname#python-}
 pkgver=0.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Remote kernel setup for Jupyter"
 arch=(any)
 url="https://bitbucket.org/tdaff/remote_ikernel"
@@ -11,13 +11,15 @@ license=('BSD')
 depends=('python-pexpect' 'jupyter-notebook')
 makedepends=('python-setuptools')
 source=(https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz
-'host.patch')
+'host.patch' 'usrfix.patch')
 sha256sums=('740b80a57fa1af40cadef541c5a4eb293675b504092ecf00c57dd2f0011bd840'
-            'bf209f55f6dea633e09a7f809ae9e1aa7c0d9fdfd0d026d8cf900b7a6d8cf6af')
+            'bf209f55f6dea633e09a7f809ae9e1aa7c0d9fdfd0d026d8cf900b7a6d8cf6af'
+            'f8c57fc530c8ba51f8baa27bb3c4e9e1ad9bc84cf841a5ebf04ffed58e58ceb2')
 
 prepare() {
   cd "$srcdir/$_name-$pkgver"
   patch -Np1 < ../host.patch
+  patch -Np1 < ../usrfix.patch
 }
 
 build() {
@@ -28,4 +30,5 @@ build() {
 package() {
   cd "$srcdir/$_name-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+  install -Dm 644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/usrfix.patch b/usrfix.patch
new file mode 100644
index 000000000000..7aa703b4f1ee
--- /dev/null
+++ b/usrfix.patch
@@ -0,0 +1,24 @@
+diff --git a/remote_ikernel/manage.py b/remote_ikernel/manage.py
+index 7814ca7..f138116 100644
+--- a/remote_ikernel/manage.py
++++ b/remote_ikernel/manage.py
+@@ -257,8 +257,10 @@ def add_kernel(interface, name, kernel_cmd, cpus=1, pe=None, language=None,
+     # False attempts a system install, otherwise install as the current user
+     if system:
+         username = False
++        prefix = '/usr'
+     else:
+         username = getpass.getuser()
++        prefix = None
+ 
+     # kernel.json file installation
+     with tempdir.TemporaryDirectory() as temp_dir:
+@@ -268,7 +270,7 @@ def add_kernel(interface, name, kernel_cmd, cpus=1, pe=None, language=None,
+             json.dump(kernel_json, kernel_file, sort_keys=True, indent=2)
+ 
+         ks.install_kernel_spec(temp_dir, kernel_name,
+-                               user=username, replace=True)
++                               user=username, replace=True, prefix=prefix)
+ 
+     return kernel_name, " ".join(display_name)
+