From dd878bd6292406edae257d57a2793b7f2bda9d67 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 25 Jun 2017 16:26:47 +0000 Subject: [PATCH] Fix: Default package template was created with wrong fullname Signed-off-by: Jan Lindemann --- scripts/jw-build-create-project.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/jw-build-create-project.sh b/scripts/jw-build-create-project.sh index 36d38e68..85cb52aa 100644 --- a/scripts/jw-build-create-project.sh +++ b/scripts/jw-build-create-project.sh @@ -68,9 +68,13 @@ cat_make_proj_mk() cat_make_project_conf() { - local login=`whoami | xargs getent passwd | cut -d: -f5` - [ "$login" ] && login=$JANWARE_USER - [ "$login" ] && login=`whoami` + local login=$JANWARE_USER + [ "$login" ] || login=`whoami` + + local fullname=`getent passwd $login | cut -d: -f5` + [ "$fullname" ] || fullname=$JANWARE_USER + [ "$fullname" ] || fullname=`whoami | xargs getent passwd | cut -d: -f5` + [ "$fullname" ] || fullname=`whoami` cat <<-EOT [summary] @@ -82,14 +86,13 @@ cat_make_project_conf() [global] group = "$pkg_group" subpackages = $subpackages - license = Copyright (c) $login, all rights reserved + license = Copyright (c) $fullname, all rights reserved jw-maintainer = $JANWARE_USER [build] libname = none [pkg.required.jw] - run = jw-build-run = VERSION devel = $name-run = VERSION-REVISION, jw-build-devel = VERSION build = jw-build-devel EOT @@ -122,7 +125,7 @@ projdir=. summary= description= -subpackages="run devel" +subpackages="run" eval set -- `getopt -- hd:s:p:g: "$@"`