|
Lines 194-213
Link Here
|
| 194 |
cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" |
194 |
cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" |
| 195 |
|
195 |
|
| 196 |
# commands to run |
196 |
# commands to run |
| 197 |
cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login" |
197 |
cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\"" |
| 198 |
cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}" |
198 |
cmdlogin1="login" |
| 199 |
cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}" |
199 |
cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\"" |
|
|
200 |
cmdupdate1="update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}" |
| 201 |
cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\"" |
| 202 |
cmdcheckout="checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}" |
| 200 |
|
203 |
|
| 201 |
cd "${ECVS_TOP_DIR}" |
204 |
cd "${ECVS_TOP_DIR}" |
| 202 |
if [ "${ECVS_AUTH}" == "pserver" ]; then |
205 |
if [ "${ECVS_AUTH}" == "pserver" ]; then |
| 203 |
einfo "Running $cmdlogin" |
206 |
einfo "Running $cmdlogin" |
| 204 |
eval $cmdlogin || die "cvs login command failed" |
207 |
echo -n " " && einfo "$cmdlogin1" |
|
|
208 |
eval ${cmdlogin} ${cmdlogin1} &>/dev/null || die "cvs login command failed" |
| 205 |
if [ "${mode}" == "update" ]; then |
209 |
if [ "${mode}" == "update" ]; then |
| 206 |
einfo "Running $cmdupdate" |
210 |
einfo "Running $cmdupdate" |
| 207 |
eval $cmdupdate || die "cvs update command failed" |
211 |
echo -n " " && einfo "$cmdupdate1" |
|
|
212 |
eval ${cmdupdate} ${cmdupdate1} || die "cvs update command failed" |
| 208 |
elif [ "${mode}" == "checkout" ]; then |
213 |
elif [ "${mode}" == "checkout" ]; then |
| 209 |
einfo "Running $cmdcheckout" |
214 |
einfo "Running $cmdcheckout" |
| 210 |
eval $cmdcheckout|| die "cvs checkout command failed" |
215 |
echo -n " " && einfo "$cmdcheckout1" |
|
|
216 |
eval ${cmdcheckout} ${cmdcheckout1} || die "cvs checkout command failed" |
| 211 |
fi |
217 |
fi |
| 212 |
# elif [ "${ECVS_AUTH}" == "ext" ]; then |
218 |
# elif [ "${ECVS_AUTH}" == "ext" ]; then |
| 213 |
# # for ext there's also a possible ssh prompt, code not yet written |
219 |
# # for ext there's also a possible ssh prompt, code not yet written |
|
Lines 267-273
Link Here
|
| 267 |
die "ERROR: Offline mode specified, but dir ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." |
273 |
die "ERROR: Offline mode specified, but dir ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." |
| 268 |
fi |
274 |
fi |
| 269 |
elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode |
275 |
elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode |
| 270 |
einfo "Fetching cvs module $ECVS_MODULE into $ECVS_TOP_DIR..." |
276 |
einfo "Fetching module '$ECVS_MODULE' into $ECVS_TOP_DIR..." |
| 271 |
cvs_fetch |
277 |
cvs_fetch |
| 272 |
else # ECVS_SERVER not set |
278 |
else # ECVS_SERVER not set |
| 273 |
die "ERROR: CVS server not set, cannot continue." |
279 |
die "ERROR: CVS server not set, cannot continue." |
