janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 15:33:55 +01:00
Code Activity

Fix: Default package template was created with wrong fullname

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-06-25 16:26:47 +00:00
commit dd878bd629
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/jw-build-create-project.sh
View file

@ -68,9 +68,13 @@ cat_make_proj_mk()
cat_make_project_conf() cat_make_project_conf()
{ {
local login=`whoami | xargs getent passwd | cut -d: -f5` local login=$JANWARE_USER
[ "$login" ] && login=$JANWARE_USER [ "$login" ] || login=`whoami`
[ "$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 cat <<-EOT
[summary] [summary]
@ -82,14 +86,13 @@ cat_make_project_conf()
[global] [global]
group = "$pkg_group" group = "$pkg_group"
subpackages = $subpackages subpackages = $subpackages
license = Copyright (c) $login, all rights reserved license = Copyright (c) $fullname, all rights reserved
jw-maintainer = $JANWARE_USER jw-maintainer = $JANWARE_USER
[build] [build]
libname = none libname = none
[pkg.required.jw] [pkg.required.jw]
run = jw-build-run = VERSION
devel = $name-run = VERSION-REVISION, jw-build-devel = VERSION devel = $name-run = VERSION-REVISION, jw-build-devel = VERSION
build = jw-build-devel build = jw-build-devel
EOT EOT
@ -122,7 +125,7 @@ projdir=.
summary= summary=
description= description=
subpackages="run devel" subpackages="run"
eval set -- `getopt -- hd:s:p:g: "$@"` eval set -- `getopt -- hd:s:p:g: "$@"`