|
Lines 83-88
Link Here
|
| 83 |
fi |
83 |
fi |
| 84 |
} |
84 |
} |
| 85 |
|
85 |
|
|
|
86 |
webapp_checkdirexists() { |
| 87 |
debug-print-function $FUNCNAME $* |
| 88 |
|
| 89 |
local my_prefix=${2:+${2}/} |
| 90 |
|
| 91 |
if [[ ! -d "${my_prefix}${1}" ]]; then |
| 92 |
msg="ebuild fault: dir '${1}' not found" |
| 93 |
eerror "$msg" |
| 94 |
eerror "Please report this as a bug at http://bugs.gentoo.org/" |
| 95 |
die "$msg" |
| 96 |
fi |
| 97 |
} |
| 98 |
|
| 86 |
webapp_check_installedat() { |
99 |
webapp_check_installedat() { |
| 87 |
debug-print-function $FUNCNAME $* |
100 |
debug-print-function $FUNCNAME $* |
| 88 |
${WEBAPP_CONFIG} --show-installed -h localhost -d "${INSTALL_DIR}" 2> /dev/null |
101 |
${WEBAPP_CONFIG} --show-installed -h localhost -d "${INSTALL_DIR}" 2> /dev/null |
|
Lines 244-251
Link Here
|
| 244 |
local my_file="$(webapp_strip_appdir "${1}")" |
257 |
local my_file="$(webapp_strip_appdir "${1}")" |
| 245 |
my_file="$(webapp_strip_cwd "${my_file}")" |
258 |
my_file="$(webapp_strip_cwd "${my_file}")" |
| 246 |
|
259 |
|
| 247 |
elog "(server owned) ${my_file}" |
260 |
elog "(server owned${3}) ${my_file}" |
| 248 |
echo "${my_file}" >> "${D}/${WA_SOLIST}" |
261 |
echo "${my_file}" >> "${D}/${2}" |
| 249 |
} |
262 |
} |
| 250 |
|
263 |
|
| 251 |
# @FUNCTION: webapp_serverowned |
264 |
# @FUNCTION: webapp_serverowned |
|
Lines 261-274
Link Here
|
| 261 |
if [[ "${1}" == "-R" ]]; then |
274 |
if [[ "${1}" == "-R" ]]; then |
| 262 |
shift |
275 |
shift |
| 263 |
for m in "$@"; do |
276 |
for m in "$@"; do |
| 264 |
find "${D}${m}" | while read a; do |
277 |
_webapp_serverowned "${m}" "${WA_SODLIST}" "recursively" |
| 265 |
a=$(webapp_strip_d "${a}") |
|
|
| 266 |
_webapp_serverowned "${a}" |
| 267 |
done |
| 268 |
done |
278 |
done |
| 269 |
else |
279 |
else |
| 270 |
for m in "$@"; do |
280 |
for m in "$@"; do |
| 271 |
_webapp_serverowned "${m}" |
281 |
_webapp_serverowned "${m}" "${WA_SOLIST}" "" |
| 272 |
done |
282 |
done |
| 273 |
fi |
283 |
fi |
| 274 |
} |
284 |
} |
|
Lines 413-421
Link Here
|
| 413 |
ewarn "This ebuild may be overwriting important files." |
423 |
ewarn "This ebuild may be overwriting important files." |
| 414 |
ewarn |
424 |
ewarn |
| 415 |
echo |
425 |
echo |
| 416 |
if has "${EAPI:-0}" 0 1 2; then |
426 |
ebeep 10 |
| 417 |
ebeep 10 |
|
|
| 418 |
fi |
| 419 |
elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then |
427 |
elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then |
| 420 |
echo |
428 |
echo |
| 421 |
eerror "You already have ${my_output} installed in ${my_dir}" |
429 |
eerror "You already have ${my_output} installed in ${my_dir}" |
