mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
makepkg: move negation in inequality comparisons
This commit changes the few remaining instances of: [[ ! $foo = "$bar" ]] to the more common: [[ $foo != "$bar" ]] Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
699937e94d
commit
60c1f2857b
@ -1032,12 +1032,12 @@ source_has_signatures() {
|
|||||||
|
|
||||||
run_pacman() {
|
run_pacman() {
|
||||||
local cmd
|
local cmd
|
||||||
if [[ ! $1 = -@(T|Qq) ]]; then
|
if [[ $1 != -@(T|Qq) ]]; then
|
||||||
cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@")
|
cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@")
|
||||||
else
|
else
|
||||||
cmd=("$PACMAN_PATH" "$@")
|
cmd=("$PACMAN_PATH" "$@")
|
||||||
fi
|
fi
|
||||||
if [[ ! $1 = -@(T|Qq) ]]; then
|
if [[ $1 != -@(T|Qq) ]]; then
|
||||||
if type -p sudo >/dev/null; then
|
if type -p sudo >/dev/null; then
|
||||||
cmd=(sudo "${cmd[@]}")
|
cmd=(sudo "${cmd[@]}")
|
||||||
else
|
else
|
||||||
@ -1194,7 +1194,7 @@ generate_one_checksum() {
|
|||||||
sum="SKIP"
|
sum="SKIP"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if [[ ! $netfile = *.@(sig?(n)|asc) ]]; then
|
if [[ $netfile != *.@(sig?(n)|asc) ]]; then
|
||||||
local file
|
local file
|
||||||
file="$(get_filepath "$netfile")" || missing_source_file "$netfile"
|
file="$(get_filepath "$netfile")" || missing_source_file "$netfile"
|
||||||
sum="$(openssl dgst -${integ} "$file")"
|
sum="$(openssl dgst -${integ} "$file")"
|
||||||
@ -1432,7 +1432,7 @@ check_pgpsigs() {
|
|||||||
esac
|
esac
|
||||||
for file in "${all_sources[@]}"; do
|
for file in "${all_sources[@]}"; do
|
||||||
file="$(get_filename "$file")"
|
file="$(get_filename "$file")"
|
||||||
if [[ ! $file = *.@(sig?(n)|asc) ]]; then
|
if [[ $file != *.@(sig?(n)|asc) ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -3238,7 +3238,7 @@ PACMAN_PATH=$(type -P $PACMAN)
|
|||||||
|
|
||||||
# check if messages are to be printed using color
|
# check if messages are to be printed using color
|
||||||
unset ALL_OFF BOLD BLUE GREEN RED YELLOW
|
unset ALL_OFF BOLD BLUE GREEN RED YELLOW
|
||||||
if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then
|
if [[ -t 2 && $USE_COLOR != "n" ]] && check_buildenv "color" "y"; then
|
||||||
# prefer terminal safe colored and bold text when tput is supported
|
# prefer terminal safe colored and bold text when tput is supported
|
||||||
if tput setaf 0 &>/dev/null; then
|
if tput setaf 0 &>/dev/null; then
|
||||||
ALL_OFF="$(tput sgr0)"
|
ALL_OFF="$(tput sgr0)"
|
||||||
|
Loading…
Reference in New Issue
Block a user