From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 149541381F3 for ; Fri, 23 Aug 2013 21:33:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADC7EE0C2D; Fri, 23 Aug 2013 21:33:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BD59E0C2D for ; Fri, 23 Aug 2013 21:33:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 070F633EBE7 for ; Fri, 23 Aug 2013 21:33:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B5CA8E545C for ; Fri, 23 Aug 2013 21:33:10 +0000 (UTC) From: "Jesus Rivero" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jesus Rivero" Message-ID: <1377293555.a07b459620a4aa05b667fc2de0c6df13e1d4eb8c.neurogeek@gentoo> Subject: [gentoo-commits] dev/neurogeek:master commit in: eclass/ X-VCS-Repository: dev/neurogeek X-VCS-Files: eclass/npm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: neurogeek X-VCS-Committer-Name: Jesus Rivero X-VCS-Revision: a07b459620a4aa05b667fc2de0c6df13e1d4eb8c X-VCS-Branch: master Date: Fri, 23 Aug 2013 21:33:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bba4a602-0914-4eba-918d-94768eb120c0 X-Archives-Hash: 92afafab90b296d0e1c7d7617707ed06 commit: a07b459620a4aa05b667fc2de0c6df13e1d4eb8c Author: Jesus Rivero gmail com> AuthorDate: Fri Aug 23 21:32:35 2013 +0000 Commit: Jesus Rivero gentoo org> CommitDate: Fri Aug 23 21:32:35 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/neurogeek.git;a=commit;h=a07b4596 Don't override NPM_MODULE if it was already defined --- eclass/npm.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/npm.eclass b/eclass/npm.eclass index b6a2cde..e4a064e 100644 --- a/eclass/npm.eclass +++ b/eclass/npm.eclass @@ -24,13 +24,15 @@ inherit multilib # The Default value for NPM_MODULE is ${PN} # # Example: NPM_MODULE="${MY_PN}" -NPM_MODULE="${PN}" +if [[ -z $NPM_MODULE ]]; then + NPM_MODULE="${PN}" +fi # @ECLASS-VARIABLE: NPM_FILES # @INTERNAL # @DESCRIPTION: # Files and directories that usually come in a standard NodeJS/npm module. -NPM_FILES="index.js lib package.json ${PN}.js" +NPM_FILES="index.js lib package.json ${NPM_MODULE}.js" # @ECLASS-VARIABLE: NPM_DOCS # @DESCRIPTION: