OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 14-Apr-2006 19:48:30
Branch: HEAD Handle: 2006041418483000
Modified files:
openpkg-tools/cmd dev.sh
Log:
commit a change which is pending since a longer time: allow one to set
the contributor/developer's official name and mail address in
~/.openpkg/dev.rc
Summary:
Revision Changes Path
1.76 +73 -11 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.75 -r1.76 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Jan 2006 09:42:09 -0000 1.75
+++ openpkg-tools/cmd/dev.sh 14 Apr 2006 17:48:30 -0000 1.76
@@ -37,7 +37,7 @@
unset OPENPKG_TOOLS_CMDPATH
fi
-# export variables
+# export variables
export OPENPKG_TOOLS
export OPENPKG_TOOLS_APIPATH
export OPENPKG_TOOLS_CMDPATH
@@ -49,24 +49,92 @@
export OPENPKG_TOOLS_CMDPATH_TRUN
export OPENPKG_ARGS
+# determine environment identification
+username="`(id -un) 2>/dev/null`"
+if [ ".$username" = . ]; then
+ str="`(id) 2>/dev/null`"
+ if [ ".`echo $str | grep '^uid[ ]*=[ ]*[0-9]*('`" != . ]; then
+ username=`echo $str | sed -e 's/^uid[ ]*=[ ]*[0-9]*(//' -e
's/).*$//'`
+ fi
+ if [ ".$username" = . ]; then
+ username="$LOGNAME"
+ if [ ".$username" = . ]; then
+ username="$USER"
+ if [ ".$username" = . ]; then
+ username="`(whoami) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+ if [ ".$username" = . ]; then
+ username="`(who am i) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+ if [ ".$username" = . ]; then
+ username='unknown'
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+domainname=''
+hostname="`(uname -n) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+if [ ".$hostname" = . ]; then
+ hostname="`(hostname) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+ if [ ".$hostname" = . ]; then
+ hostname='unknown'
+ fi
+fi
+case $hostname in
+ *.* )
+ domainname=".`echo $hostname | cut -d. -f2-`"
+ hostname="`echo $hostname | cut -d. -f1`"
+ ;;
+esac
+if [ ".$domainname" = . ]; then
+ if [ -f /etc/resolv.conf ]; then
+ domainname="`grep '^[ ]*domain' /etc/resolv.conf | sed -e 'q'
|\
+ sed -e 's/.*domain//' \
+ -e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \
+ -e 's/^\.//' -e 's/^/./' |\
+ awk '{ printf("%s", $1); }'`"
+ if [ ".$domainname" = . ]; then
+ domainname="`grep '^[ ]*search' /etc/resolv.conf | sed -e 'q'
|\
+ sed -e 's/.*search//' \
+ -e 's/^[ ]*//' -e 's/^ *//' -e 's/^
*//' \
+ -e 's/ .*//' -e 's/ .*//' \
+ -e 's/^\.//' -e 's/^/./' |\
+ awk '{ printf("%s", $1); }'`"
+ fi
+ fi
+fi
+realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd .)
2>/dev/null |\
+ grep "^${username}:" | awk -F: '{ print $5; }'`
+if [ ".$realname" = . ]; then
+ realname="unknown"
+fi
+
# default configuration
OPENPKG_INST=`[ -r /etc/openpkg ] && grep /openpkg </etc/openpkg | sort -r;
[ -r /etc/openpkg ] && grep -v /openpkg </etc/openpkg | sort -r`
OPENPKG_INST=`echo ${OPENPKG_INST:-/openpkg}`
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
# special override for openpkg.net domain
-case `hostname` in
+case "$hostname$domainname" in
*.openpkg.net )
OPENPKG_MODE=developer
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
- [EMAIL PROTECTED]:
+ [EMAIL PROTECTED]:/
+ OPENPKG_NAME="$realname"
+ OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
* )
OPENPKG_MODE=contributor
OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD
+ OPENPKG_NAME="$realname"
+ OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
esac
export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
@@ -1531,6 +1599,7 @@
# enter environment
echo "++ entering OpenPKG development shell (mode:
[1m${OPENPKG_MODE}[m)"
+ echo "++ OpenPKG ${OPENPKG_MODE}: [1m${OPENPKG_NAME}[m
<${OPENPKG_MAIL}>"
${bash} --rcfile .bashrc${GUID}
command rm .bashrc${GUID}
echo "++ leaving OpenPKG development shell"
@@ -1854,16 +1923,9 @@
echo "++ determining contributor identification"
shtoolE=`rpmE --eval '%{l_shtool}'`
thisdate=`${shtoolE} echo -e '%D-%m-%Y'`
- username=`${shtoolE} echo -e '%u'`
- hostname=`${shtoolE} echo -e '%h%d'`
- realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump
passwd .) 2>/dev/null |\
- grep "^${username}:" | ${AWK} -F: '{ print $5; }'`
- if [ ".$realname" = . ]; then
- realname="NN"
- fi
echo "++ generating patch file (${OPENPKG_WORK}/${name}.diff)"
- ( echo "From: $realname <[EMAIL PROTECTED]>"
+ ( echo "From: $OPENPKG_NAME <$OPENPKG_MAIL>"
echo "Date: $thisdate"
if [ ".${msg}" = . ]; then
msg="unknown contribution"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
