f4da297de2
In commit882e707e40we changed message output to go to stdout by default, unless it was an error. The plain() function doesn't *look* like an error function, but in practice it was -- it's used to continue multiline messages, and all in-tree uses were for warning/error. This is a problem both because we're sending output to the wrong place, and because in some cases, we were performing error logging from a function which would otherwise return a value to be captured in a variable using command substution. Fix this and straighten out the API by providing two functions: one for continuing msg output, and one which wraps this by sending output to stderr, for continuing error output. Change all callers to use the second function. (cherry picked from commitbf458cced7)
114 lines
2.6 KiB
Bash
114 lines
2.6 KiB
Bash
#!/bin/bash
|
|
#
|
|
# util.sh - general utility functions
|
|
#
|
|
# Copyright (c) 2006-2020 Pacman Development Team <pacman-dev@archlinux.org>
|
|
# Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
[[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ]] && return
|
|
LIBMAKEPKG_UTIL_UTIL_SH=1
|
|
|
|
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
|
|
|
source "$LIBRARY/util/error.sh"
|
|
source "$LIBRARY/util/message.sh"
|
|
|
|
##
|
|
# usage : in_array( $needle, $haystack )
|
|
# return : 0 - found
|
|
# 1 - not found
|
|
##
|
|
in_array() {
|
|
local needle=$1; shift
|
|
local item
|
|
for item in "$@"; do
|
|
[[ $item = "$needle" ]] && return 0 # Found
|
|
done
|
|
return 1 # Not Found
|
|
}
|
|
|
|
# tests if a variable is an array
|
|
is_array() {
|
|
local v=$1
|
|
local ret=1
|
|
|
|
if [[ ${!v@a} = *a* ]]; then
|
|
ret=0
|
|
fi
|
|
|
|
return $ret
|
|
}
|
|
|
|
# Canonicalize a directory path if it exists
|
|
canonicalize_path() {
|
|
local path="$1"
|
|
|
|
if [[ -d $path ]]; then
|
|
(
|
|
cd_safe "$path"
|
|
pwd -P
|
|
)
|
|
else
|
|
printf "%s\n" "$path"
|
|
fi
|
|
}
|
|
|
|
dir_is_empty() {
|
|
(
|
|
shopt -s dotglob nullglob
|
|
files=("$1"/*)
|
|
(( ${#files} == 0 ))
|
|
)
|
|
}
|
|
|
|
cd_safe() {
|
|
if ! cd "$1"; then
|
|
error "$(gettext "Failed to change to directory %s")" "$1"
|
|
plainerr "$(gettext "Aborting...")"
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
# Try to create directory if one does not yet exist. Fails if the directory
|
|
# exists but has no write permissions, or if there is an existing file with
|
|
# the same name.
|
|
ensure_writable_dir() {
|
|
local dirtype="$1" dirpath="$2"
|
|
|
|
if ! mkdir -p "$dirpath" 2>/dev/null; then
|
|
error "$(gettext "Failed to create the directory \$%s (%s).")" "$dirtype" "$dirpath"
|
|
return 1
|
|
elif [[ ! -w $dirpath ]]; then
|
|
error "$(gettext "You do not have write permission for the directory \$%s (%s).")" "$dirtype" "$dirpath"
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
# source a file and fail if it does not succeed
|
|
source_safe() {
|
|
local shellopts=$(shopt -p extglob)
|
|
shopt -u extglob
|
|
|
|
if ! source "$@"; then
|
|
error "$(gettext "Failed to source %s")" "$1"
|
|
exit $E_MISSING_FILE
|
|
fi
|
|
|
|
eval "$shellopts"
|
|
}
|