[arch-commits] Commit in cjdns/trunk (PKGBUILD cjdns.install)

[Levente Polyak]

    Date: Tuesday, March 14, 2017 @ 22:26:59
  Author: anthraxx
Revision: 216326

upgpkg: cjdns 19.1-2 (less noisy install and added opt tools)

Modified:
  cjdns/trunk/PKGBUILD
  cjdns/trunk/cjdns.install

---------------+
 PKGBUILD      |    7 +++++--
 cjdns.install |   10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-14 20:34:07 UTC (rev 216325)
+++ PKGBUILD	2017-03-14 22:26:59 UTC (rev 216326)
@@ -6,12 +6,13 @@
 
 pkgname=cjdns
 pkgver=19.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Routing engine designed for security, scalability, speed and ease of use'
 url='https://github.com/cjdelisle/cjdns'
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('glibc' 'sh')
+optdepends=('nodejs: optional utilities support')
 makedepends=('nodejs' 'python2')
 install=cjdns.install
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz)
@@ -20,7 +21,8 @@
 
 build() {
   cd ${pkgname}-${pkgname}-v${pkgver}
-  CJDNS_RELEASE_VERSION="${pkgver}" bash 'do'
+  CJDNS_RELEASE_VERSION="${pkgver}" \
+    node ./node_build/make.js
 }
 
 package() {
@@ -40,6 +42,7 @@
     doc/security_specification.md \
     doc/shorewall_and_vpn_gateway_howto.md \
     doc/tunnel.md
+  cp -a tools "${pkgdir}/usr/lib/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et:

Modified: cjdns.install
===================================================================
--- cjdns.install	2017-03-14 20:34:07 UTC (rev 216325)
+++ cjdns.install	2017-03-14 22:26:59 UTC (rev 216326)
@@ -4,19 +4,19 @@
 
   if [[ ! -e "${config_path}" ]] ; then
     echo "Generating ${config_file}... "
-    (umask 077 && cjdroute --genconf > "${config_path}") || 
+    (umask 077 && cjdroute --genconf > "${config_path}") ||
       echo "ERROR: Failed to generate and install ${config_file}"
     echo "
     >>> The keys in ${config_path} have been autogenerated during
-    >>> install, they are not defaults and do not need to be overwritten."
-  fi
-  echo "
+    >>> install, they are not defaults and do not need to be overwritten.
+
     >>> Protect ${config_path}! A lost conf file means you have
     >>> lost your password and connections and anyone who connected
     >>> to you will no longer be able to connect. A *compromised*
     >>> conf file means that other people can impersonate you on
     >>> the network.
-  "
+"
+  fi
 }
 
 post_upgrade() {