Change recipe into better configuration

3 files changed, 51 insertions, 54 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c6af087ecd24..1ceffadd4483 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,58 +4,50 @@
 
 pkgname=nteract
 pkgver=0.28.0
-pkgrel=1
-pkgdesc='Interactive literate coding notebook'
-url='https://nteract.io/'
-arch=('x86_64')
-license=('BSD 3-Clause')
-depends=('gtk3' 'nss' 'libxcrypt' 'libxcrypt-compat' 'ruby' 'python')
-makedepends=('nodejs' 'npm' 'yarn')
-optdepends=('ihaskell-git: support for Haskell'
-            'julia: support for Julia (requires the "IJulia" package)'
-            'python-ipykernel: support for Python 3'
-            'python2-ipykernel: support for Python 2'
-            'r: support for R (requires the "IRkernel" package)'
-            'sagemath-jupyter: support for SageMath')
+pkgrel=2
+pkgdesc="Interactive literate coding notebook"
+url="https://nteract.io/"
+arch=("x86_64")
+license=("BSD")
+
+depends=("gtk3" "nss" "libxcrypt" "libxcrypt-compat" "ruby" "python")
+makedepends=("nodejs" "npm" "yarn")
+optdepends=("ihaskell: support for Haskell"
+            "sagemath-jupyter: support for SageMath"
+            "python-ipykernel: support for Python 3"
+            "julia: support for Julia (requires the \"IJulia\" package)"
+            "r: support for R (requires the \"IRkernel\" package)")
+
+conflicts=("nteract-bin" "nteract-appimage")
+replaces=("$pkgname")
+provides=("$pkgname")
+
 source=(v${pkgver}.tar.gz::https://github.com/nteract/nteract/archive/refs/tags/v${pkgver}.tar.gz
-				'LICENSE::https://raw.githubusercontent.com/nteract/nteract/main/LICENSE'
-        'nteract.desktop')
+        "LICENSE::https://raw.githubusercontent.com/nteract/nteract/main/LICENSE")
+
 sha256sums=('5132a05ca269aa3b1b0a96cbe4a7b9956454069029173f6f1cb3d73a59a83073'
-						'866e6fa48cb8810d36d8d85a3085d7aa1c4317d3731f0ef84919428fee87bf71'
-            'b2d43d3d75ca35ccbacbf4db73cbd64a6e5b2346218152731df0de39d58a7fa1')
-conflicts=('nteract-bin')
+            '866e6fa48cb8810d36d8d85a3085d7aa1c4317d3731f0ef84919428fee87bf71')
 
 prepare() {
-	cd nteract-${pkgver}
+  cd "${srcdir}"
 
-	yarn install
+  patch --forward --strip=1 < ../package.patch 
 }
 
 build() {
-	cd nteract-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-	NODE_OPTIONS="--max-old-space-size=8192" yarn run pack
+  NODE_OPTIONS="--max-old-space-size=8192" yarn
+  NODE_OPTIONS="--max-old-space-size=8192" yarn verifyBeforePublish
+  NODE_OPTIONS="--max-old-space-size=8192" yarn dist:linux
+  NODE_OPTIONS="--max-old-space-size=8192" yarn ship:desktop
 }
 
 package() {
-  mkdir "$pkgdir"/opt
-  mkdir "$pkgdir"/usr
-
-  mkdir "$pkgdir"/usr/bin
-
-  mkdir "$pkgdir"/usr/share
-  mkdir "$pkgdir"/usr/share/applications
-  mkdir "$pkgdir"/usr/share/licenses
-  mkdir "$pkgdir"/usr/share/licenses/$pkgname
-
-  cp -a nteract-${pkgver}/applications/desktop/dist/linux-unpacked "$pkgdir"/opt/$pkgname
-  cp -a nteract-${pkgver}/applications/desktop/static "$pkgdir"/opt/$pkgname/resources/
-
-  chmod u+s "$pkgdir"/opt/$pkgname/chrome-sandbox
-
-	ln -s /opt/$pkgname/$pkgname "$pkgdir"/usr/bin/$pkgname
-
-  install -Dm 644 ${pkgname}.desktop "$pkgdir"/usr/share/applications/${pkgname}.desktop
-
-	install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm 644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/applications/desktop/static/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm 755 "${srcdir}/${pkgname}-${pkgver}/applications/desktop/dist/linux-unpacked" "${pkgdir}/opt/${pkgname}"
+  
+  chmod u+s "${pkgdir}/opt/${pkgname}/chrome-sanbox"
 }
diff --git a/nteract.desktop b/nteract.desktop
index abf310a9f533..d498f6ee9995 100644
--- a/nteract.desktop
+++ b/nteract.desktop
@@ -1,16 +1,11 @@
 [Desktop Entry]
-Comment=Interactive literate coding notebook!
-Exec=/opt/nteract/nteract
-GenericName[en_US]=nteract
-GenericName=nteract
-Icon=/opt/nteract/resources/static/icon.png
-MimeType=application/x-ipynb+json;
-Name[en_US]=nteract
 Name=nteract
-Path=/opt/nteract/
-StartupWMClass=nteract
-StartupNotify=true
+Exec=/opt/nteract/nteract %U
 Terminal=false
 Type=Application
-X-KDE-SubstituteUID=false
-Categories=Science;Development;
+Icon=nteract
+StartupWMClass=nteract
+Comment=Interactive literate coding notebook!
+MimeType=application/x-ipynb+json;
+StartupNotify=true
+Categories=Science;
diff --git a/package.patch b/package.patch
new file mode 100644
index 000000000000..49927bc70968
--- /dev/null
+++ b/package.patch
@@ -0,0 +1,10 @@
+--- src/nteract-0.28.0/package.json	2021-01-26 12:09:27.000000000 +0700
++++ package.json	2023-07-04 14:36:07.557769436 +0700
+@@ -65,6 +65,7 @@
+     "prettify": "prettier --write '**/*.{ts,tsx,js,json}' '!**/{dist,lib.git,.next,package.json,build,mathjax-electron}/**'",
+     "pack": "lerna run pack --scope nteract --stream",
+     "dist": "lerna run dist --scope nteract --stream",
++    "dist:linux": "lerna run dist:linux --scope nteract --stream",
+     "dist:all": "lerna run dist:all --scope nteract --stream",
+     "report:all": "npm run report:jext && npm run report:desktop",
+     "report:jext": "tsc -b applications/jupyter-extension",