[arch-commits] Commit in apm/trunk (PKGBUILD no-scripts.patch use-system-npm.patch)

[Nicola Squartini]

    Date: Sunday, December 13, 2020 @ 05:12:43
  Author: tensor5
Revision: 773780

upgpkg: apm 2.6.1-1

Modified:
  apm/trunk/PKGBUILD
  apm/trunk/no-scripts.patch
  apm/trunk/use-system-npm.patch

----------------------+
 PKGBUILD             |   42 +++++++++++++++++++++++++-----------------
 no-scripts.patch     |    2 +-
 use-system-npm.patch |   14 +++++++-------
 3 files changed, 33 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-13 03:28:13 UTC (rev 773779)
+++ PKGBUILD	2020-12-13 05:12:43 UTC (rev 773780)
@@ -1,7 +1,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=apm
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 pkgdesc='Atom package manager'
 arch=('x86_64')
@@ -18,10 +18,10 @@
         'no-scripts.patch'
         'use-system-npm.patch'
         'git-utils.patch')
-sha512sums=('514caa5703fb81036c5f99b47361a7e903615f2a046d6430fce9407c93b3cc1274bafbb9f29486a6726731ea8bcfa981a68f3f4546d282ff0551ee5ed9928c9a'
+sha512sums=('e4b29069b2106cc9d8179344fca4fc6032751e7b878c9302a4f4af7fcf28f638e9f0d38df4b206db85f23743a7bec0287093100fee3637ff8e771388cc44ffaf'
             'c02c18e00c378fc968cd593bfed3ff0636a2786fa9ef212547efc30c54576f55dc94ac503b827ec79283c5deb87a22a7046565d8c630d55ed20d0ad020f8a77f'
-            'a51ec885b0cd44ba468a98b43e42cc66546031d97b43ab86be73cd15766ef7e9ae442c9e0a495215e37a83899fd256ec18708596b75ef47dbe12d3c8da2fc084'
-            'a78f9b1539d3eb38f2cd760b64efc8e9dd44dd2faf41a2d85bc2b21101828bea931c7855221cc69cfda3695f979ee85f17b299878424739c96cc3e96bed5d17f'
+            'a962ecc1557bcfe92c8d771a44c3bbbd72d0bf9c81285662ef26a1f99f3604efcca0307e7edb59eb99c2cbc83db4ab844f0db0532ca990581eff28e50c42acd6'
+            'de912b3da4f0433be1d960e849dbaf664b6b0d9366b9b8fb784e79f4d5ea35a24cc76c11c9f662b615a66b14ac92c1009d6b85e2c02395d87e27b15daaaa59b8'
             'bf9f4023bfbdc7240e5ed8a87bc9097eb7a57b2bae44f1044098eb380b15ff8a12f92347b99b6754c6adb537b8310d1f47bdfd3e60db411e4d69d575ce70b2a6')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
@@ -47,32 +47,40 @@
 build() {
   cd apm-${pkgver}
 
-  npm update keytar  # Node 12
-  npm install coffee-script
-  npx coffee -c --no-header -o lib src/*.coffee
-  rm -r node_modules
-  npm install --user root -g --prefix="${srcdir}"/apm-build/usr $(npm pack | tail -1)
+  npm install
+  npx coffee --compile --output lib src
+  npm uninstall coffee-script coffeelint express jasmine-focused shx node-gyp
 
-  cd "${srcdir}/apm-build/usr/lib/node_modules/atom-package-manager/node_modules/git-utils"
+  cd node_modules/git-utils
   patch -Np1 -i "${srcdir}/git-utils.patch"
   node-gyp rebuild
+  cd ../..
+
+  npm pack
 }
 
 package() {
-  cp -r "${srcdir}"/apm-build/usr "${pkgdir}"
+  cd apm-${pkgver}
 
-  cd "${pkgdir}"${_apmdir}
-  install -m644 "${srcdir}"/apm-${pkgver}/README.md ./
+  install -d -m755 "${pkgdir}${_apmdir}"
+  tar -xf atom-package-manager-*.tgz --strip-components 1 \
+      -C "${pkgdir}${_apmdir}"
+  cp -r node_modules "${pkgdir}${_apmdir}"
 
+  install -d -m755 "${pkgdir}/usr/bin"
+  ln -s \
+      "$(realpath --relative-to="${pkgdir}/usr/bin" "${pkgdir}${_apmdir}/bin/apm")" \
+      "${pkgdir}/usr/bin"
+
   # Install license file
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \
-     "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s \
+      "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${pkgdir}${_apmdir}/LICENSE.md")" \
+      "${pkgdir}/usr/share/licenses/${pkgname}"
 
   # Remove occurrences of ${srcdir}
   find "${pkgdir}" -name "package.json" \
-       -exec sed -e "s|${srcdir}/apm-build||" \
-                 -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \
+       -exec sed -e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \
                  -i '{}' \;
 
   # Remove useless stuff

Modified: no-scripts.patch
===================================================================
--- no-scripts.patch	2020-12-13 03:28:13 UTC (rev 773779)
+++ no-scripts.patch	2020-12-13 05:12:43 UTC (rev 773780)
@@ -2,7 +2,7 @@
 +++ b/package.json
 @@ -14,18 +14,6 @@
    "bin": {
-     "apm": "./bin/apm"
+     "apm": "bin/apm"
    },
 -  "scripts": {
 -    "check-version": "node script/check-version.js",

Modified: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2020-12-13 03:28:13 UTC (rev 773779)
+++ use-system-npm.patch	2020-12-13 05:12:43 UTC (rev 773780)
@@ -1,10 +1,10 @@
 --- a/package.json
 +++ b/package.json
 @@ -39,7 +39,6 @@
-     "keytar": "^4.13.0",
-     "mv": "2.0.0",
-     "ncp": "~0.5.1",
--    "npm": "^6.14.4",
-     "open": "0.0.5",
-     "q": "~0.9.7",
-     "read": "~1.0.5",
+     "keytar": "^6.0.1",
+     "mv": "2.1.1",
+     "ncp": "~2.0.0",
+-    "npm": "^6.14.9",
+     "open": "7.3.0",
+     "q": "~1.5.1",
+     "read": "~1.0.7",