OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 09-Jul-2004 14:13:21
Branch: HEAD Handle: 2004070913132000
Modified files:
openpkg-tools/cmd dev.sh
Log:
extend "special override for dev.de.cw.net domain" for choosing
default contributor/developer mode; do not complain abount T/E MPX
choice if T=E; make sure "openpkg dev" alias does not end with space
to avoid triggering a bash feature/bug; replace nonexistent find_tool
with uwhich; override user alias for "ls" on places we want to control
Summary:
Revision Changes Path
1.28 +38 -30 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.27 -r1.28 dev.sh
--- openpkg-tools/cmd/dev.sh 7 Jul 2004 11:36:56 -0000 1.27
+++ openpkg-tools/cmd/dev.sh 9 Jul 2004 12:13:20 -0000 1.28
@@ -54,14 +54,21 @@
OPENPKG_INST="/openpkg-dev /openpkg-21 /openpkg-20 /openpkg-13"
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
-OPENPKG_MODE=contributor # contributor
-OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs # contributor
-OPENPKG_RMOD=openpkg-src # contributor
-OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD # contributor
-#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs # developer
-#OPENPKG_RMOD=openpkg-src # developer
-#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/ # developer
+# special override for dev.de.cw.net domain
+case `hostname` in
+*.dev.de.cw.net )
+ OPENPKG_MODE=developer
+ [EMAIL PROTECTED]:/e/openpkg/cvs
+ OPENPKG_RMOD=openpkg-src
+ OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/
+ ;;
+* )
+ OPENPKG_MODE=contributor
+ OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs
+ OPENPKG_RMOD=openpkg-src
+ OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD
+ ;;
+esac
export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
# enforced and user controlled (through package/branch/execute) variables
@@ -122,18 +129,18 @@
esac
case ${opt} in
-h|--help ) help=1 ;;
- --inst=* ) OPENPKG_INST=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--inst=${arg} ";;
- --work=* ) OPENPKG_WORK=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--work=${arg} ";;
- --temp=* ) OPENPKG_TEMP=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--temp=${arg} ";;
- --mode=* ) OPENPKG_MODE=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--mode=${arg} ";;
- --repo=* ) OPENPKG_REPO=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--repo=${arg} ";;
- --rmod=* ) OPENPKG_RMOD=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--rmod=${arg} ";;
- --dist=* ) OPENPKG_DIST=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--dist=${arg} ";;
- --spec=* ) OPENPKG_SPEC=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--spec=${arg} ";;
- --ctag=* ) OPENPKG_CTAG=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--ctag=${arg} ";;
- --exec=* ) OPENPKG_EXEC=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--exec=${arg} ";;
- --trun=* ) OPENPKG_TRUN=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--trun=${arg} ";;
- --sdir=* ) OPENPKG_SDIR=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--sdir=${arg} ";;
+ --inst=* ) OPENPKG_INST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--inst=${arg}";;
+ --work=* ) OPENPKG_WORK=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--work=${arg}";;
+ --temp=* ) OPENPKG_TEMP=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--temp=${arg}";;
+ --mode=* ) OPENPKG_MODE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--mode=${arg}";;
+ --repo=* ) OPENPKG_REPO=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--repo=${arg}";;
+ --rmod=* ) OPENPKG_RMOD=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--rmod=${arg}";;
+ --dist=* ) OPENPKG_DIST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--dist=${arg}";;
+ --spec=* ) OPENPKG_SPEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--spec=${arg}";;
+ --ctag=* ) OPENPKG_CTAG=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--ctag=${arg}";;
+ --exec=* ) OPENPKG_EXEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--exec=${arg}";;
+ --trun=* ) OPENPKG_TRUN=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--trun=${arg}";;
+ --sdir=* ) OPENPKG_SDIR=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--sdir=${arg}";;
-* ) help="Invalid option \`${opt}'"; break ;;
* ) break ;;
esac
@@ -294,7 +301,7 @@
execute | ex* ) shift; openpkg_dev_execute "${arg}"; cd . ;;
tools | to* ) shift; openpkg_dev_tools "${arg}"; cd . ;;
srcdir | sr* ) shift; openpkg_dev_srcdir "${arg}"; cd . ;;
- * ) command $T/bin/openpkg dev "$@"
+ * ) command $T/bin/openpkg dev "$@" ;;
esac
elif [ ".$1" = .rpm ]; then
shift
@@ -327,6 +334,8 @@
openpkgi -e "$@"
elif [ ".$1" = .rpm2cpio ]; then
openpkgi -e "$@"
+ elif [ ".$E" = ".$T" ]; then
+ openpkgi -e "$@"
else
echo "$0:ERROR: don't know which openpkg multiplexer to call (unknown
command $1)" 1>&2
return 1
@@ -503,7 +512,7 @@
local command
if [ ${opt_i} = yes ]; then
# enter interactive session with root privileges
- local xtermcontrol=`find_tool xtermcontrol xtermcolors`
+ local xtermcontrol=`uwhich xtermcontrol xtermcolors`
if [ -n "${xtermcontrol}" ]; then
prolog="${xtermcontrol} --cursor='#cc3333'"
epilog="${xtermcontrol} --cursor='#000000'"
@@ -650,7 +659,7 @@
EOF
echo "++ creating directory structure (${OPENPKG_REPO}/{dst,pkg})"
- # special overridden setup for dev.de.cw.net domain
+ # special override for dev.de.cw.net domain
case `hostname` in
*.dev.de.cw.net )
( echo ""
@@ -1267,8 +1276,7 @@
PS1="[EMAIL PROTECTED]:${PWD}${ID}\n${OPENPKG_MODE}\$ "
fi
}
-
- alias opd="openpkg dev $OPENPKG_ARGS"
+ alias opd="openpkg dev${OPENPKG_ARGS:+ }$OPENPKG_ARGS"
}
bashrcepilog () {
@@ -1284,7 +1292,7 @@
cd
# self destruction
- rm ${OPENPKG_WORK}/.bashrc
+ command rm ${OPENPKG_WORK}/.bashrc
}
bash () {
@@ -1551,7 +1559,7 @@
cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
"${OPENPKG_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
rpm_version_old=`rpmE -q --qf "%{VERSION}" --specfile ${tmpfile}
2>/dev/null`
rpm_release_old=`rpmE -q --qf "%{RELEASE}" --specfile ${tmpfile}
2>/dev/null`
- rm -f ${tmpfile}
+ command rm -f ${tmpfile}
[ ".${rpm_version_old}" = . ] && die "cannot determine old version
number"
[ ".${rpm_release_old}" = . ] && die "cannot determine old release
number"
fi
@@ -2278,7 +2286,7 @@
sed <${tmpfile} -n -e '/^%prep$/,/^$/p'
rc=$?
fi
- rm ${tmpfile}
+ command rm ${tmpfile}
if [ $rc -gt 0 -a $force -ne 1 ]; then
die "command in %prep section of ${tmpfile} returned error"
fi
@@ -2332,7 +2340,7 @@
echo "++ Cleaning out all dst files for $spec"
for s in `builtin cd ${OPENPKG_WORK}/dst/${spec}/ && echo *`; do
f="${OPENPKG_WORK}/dst/${spec}/${s}"
- [ -f "${f}" ] && rm "${f}"
+ [ -f "${f}" ] && command rm "${f}"
[ -e "${f}" -o -L "${f}" ] && die "Problem wiping out ${f}"
done
fi
@@ -2341,7 +2349,7 @@
echo "++ Cleaning out selected dst files for $spec"
for s in `builtin cd ${OPENPKG_WORK}/$S/${spec}/ && echo *`; do
f="${OPENPKG_WORK}/dst/${spec}/${s}"
- [ -f "${f}" ] && rm "${f}"
+ [ -f "${f}" ] && command rm "${f}"
[ -e "${f}" -o -L "${f}" ] && die "Problem wiping out ${f}"
done
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
