|
Lines 208-214
Link Here
|
| 208 |
avoid_utils="$1" |
208 |
avoid_utils="$1" |
| 209 |
;; |
209 |
;; |
| 210 |
-nc|-C|--no-color|--nocolor) |
210 |
-nc|-C|--no-color|--nocolor) |
| 211 |
# TODO: Does this variable do anything now that the main color functions are removed? |
|
|
| 212 |
export NOCOLOR=1 |
211 |
export NOCOLOR=1 |
| 213 |
;; |
212 |
;; |
| 214 |
-l|-np|--no-ld-path) |
213 |
-l|-np|--no-ld-path) |
|
Lines 248-255
Link Here
|
| 248 |
sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:' |
247 |
sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:' |
| 249 |
} |
248 |
} |
| 250 |
fi |
249 |
fi |
|
|
250 |
# Normalize some EMERGE_OPTIONS |
| 251 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-p/--pretend}) |
251 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-p/--pretend}) |
| 252 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--fetchonly}) |
252 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--fetchonly}) |
|
|
253 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--verbose}) |
| 253 |
if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then |
254 |
if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then |
| 254 |
ewarn "You are not superuser. Adding --pretend to emerge options." |
255 |
ewarn "You are not superuser. Adding --pretend to emerge options." |
| 255 |
EMERGE_OPTIONS+=(--pretend) |
256 |
EMERGE_OPTIONS+=(--pretend) |
|
Lines 315-321
Link Here
|
| 315 |
LD_LIBRARY_MASK=$(clean_var "$LD_LIBRARY_MASK") |
316 |
LD_LIBRARY_MASK=$(clean_var "$LD_LIBRARY_MASK") |
| 316 |
|
317 |
|
| 317 |
# Use the color preference from portage |
318 |
# Use the color preference from portage |
| 318 |
NOCOLOR=$(portageq envvar NOCOLOR) |
319 |
export NOCOLOR=$(portageq envvar NOCOLOR) |
| 319 |
|
320 |
|
| 320 |
set_trap() { |
321 |
set_trap() { |
| 321 |
trap "rm_temp $1" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM |
322 |
trap "rm_temp $1" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM |
|
Lines 374-379
Link Here
|
| 374 |
# We don't care if these emerge options change |
375 |
# We don't care if these emerge options change |
| 375 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--pretend/}) |
376 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--pretend/}) |
| 376 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--fetchonly/}) |
377 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--fetchonly/}) |
|
|
378 |
EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--verbose/}) |
| 377 |
cat <<- EOF |
379 |
cat <<- EOF |
| 378 |
SEARCH_DIRS="$SEARCH_DIRS" |
380 |
SEARCH_DIRS="$SEARCH_DIRS" |
| 379 |
SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK" |
381 |
SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK" |
