CVS java-package/lib
Jeroen van Wolffelaar
jeroen@haydn.debian.org
Mon Jan 24 16:26:08 2005
Update of /cvsroot/pkg-java/java-package/lib
In directory haydn:/tmp/cvs-serv19852/lib
Modified Files:
common.sh
Log Message:
Use DEBEMAIL at all unconditionally -- don't ask those values if they are
provided
--- /cvsroot/pkg-java/java-package/lib/common.sh 2005/01/24 23:07:44 1.3
+++ /cvsroot/pkg-java/java-package/lib/common.sh 2005/01/24 23:25:51 1.4
@@ -117,20 +117,20 @@
function read_maintainer_info() {
if [ -z "$maintainer_name" ]; then
+ if [ -n "$DEBFULLNAME" ]; then
+ maintainer_name="$DEBFULLNAME"
+ elif [ -n "$DEBNAME" ]; then
+ maintainer_name="$DEBNAME"
+ else
+ default_name="$(getent passwd $(id -run) | cut -d: -f5| cut -d, -f1)"
+
cat << EOF
Please enter your full name. This value will be used in the maintainer
field of the created package.
EOF
- if [ -n "$DEBFULLNAME" ]; then
- default_name="$DEBFULLNAME"
- elif [ -n "$DEBNAME" ]; then
- default_name="$DEBNAME"
- else
- default_name="$(getent passwd $(id -run) | cut -d: -f5| cut -d, -f1)"
- fi
-
+
# gecos can be null
while [ -z "$maintainer_name" ]; do
read -e -p "Full name [$default_name]:" maintainer_name
@@ -138,9 +138,19 @@
maintainer_name="$default_name"
fi
done
+ fi
fi
if [ -z "$maintainer_email" ]; then
+ local default_email=
+ if [ -n "$DEBEMAIL" ]; then
+ maintainer_email="$DEBEMAIL"
+ else
+ if [ -r "/etc/mailname" ]; then
+ default_email="$( id -run )@$( cat /etc/mailname )"
+ else
+ default_email="$( id -run )@$( hostname --fqdn )"
+ fi
cat << EOF
Please enter a valid email address or press return to accept the
@@ -148,17 +158,10 @@
the created package.
EOF
- local default_email=
- if [ -n "$DEBEMAIL" ]; then
- default_email="$DEBEMAIL"
- elif [ -r "/etc/mailname" ]; then
- default_email="$( id -run )@$( cat /etc/mailname )"
- else
- default_email="$( id -run )@$( hostname --fqdn )"
- fi
read -e -p "Email [$default_email]: " maintainer_email
if [ -z "$maintainer_email" ]; then
maintainer_email="$default_email"
fi
+ fi
fi
}