lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Invert negative bash assertions

Browse Source 
In bash `-n` is `non zero length` which is the opposite of `-z` meaning
`zero length`. `-n` is semantically identical to `! -z` but `-n`.

Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
Joe Groocock
2021-02-12 16:33:15 +00:00
parent 5af1dcb8b1
commit 95b93c60d9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
misc/make-deps.sh
View File

@@ -40,11 +40,11 @@ if [ -z "$YUM" -a -z "$APT" -a -z "$BREW" -a -z "$PACMAN" ]; then
fi fi
# I think having both installed confused golang somehow... # I think having both installed confused golang somehow...
if [ ! -z "$YUM" ] && [ ! -z "$APT" ]; then if [ -n "$YUM" -a -n "$APT" ]; then
echo "You have both $APT and $YUM installed. Please check your deps manually." echo "You have both $APT and $YUM installed. Please check your deps manually."
fi fi
if [ ! -z "$YUM" ]; then if [ -n "$YUM" ]; then
$sudo_command $YUM install -y libvirt-devel $sudo_command $YUM install -y libvirt-devel
$sudo_command $YUM install -y augeas-devel $sudo_command $YUM install -y augeas-devel
$sudo_command $YUM install -y ruby-devel rubygems $sudo_command $YUM install -y ruby-devel rubygems
@@ -53,7 +53,7 @@ if [ ! -z "$YUM" ]; then
$sudo_command $YUM install -y gcc make rpm-build libffi-devel bsdtar mkosi || true $sudo_command $YUM install -y gcc make rpm-build libffi-devel bsdtar mkosi || true
$sudo_command $YUM install -y graphviz || true # for debugging $sudo_command $YUM install -y graphviz || true # for debugging
fi fi
if [ ! -z "$APT" ]; then if [ -n "$APT" ]; then
$sudo_command $APT install -y libvirt-dev || true $sudo_command $APT install -y libvirt-dev || true
$sudo_command $APT install -y libaugeas-dev || true $sudo_command $APT install -y libaugeas-dev || true
$sudo_command $APT install -y ruby ruby-dev || true $sudo_command $APT install -y ruby ruby-dev || true
@@ -69,24 +69,24 @@ if [ ! -z "$APT" ]; then
$sudo_command $APT install -y graphviz # for debugging $sudo_command $APT install -y graphviz # for debugging
fi fi
if [ ! -z "$BREW" ]; then if [ -n "$BREW" ]; then
# coreutils contains gtimeout, gstat, etc # coreutils contains gtimeout, gstat, etc
$BREW install pkg-config libvirt augeas coreutils || true $BREW install pkg-config libvirt augeas coreutils || true
fi fi
if [ ! -z "$PACMAN" ]; then if [ -n "$PACMAN" ]; then
$sudo_command $PACMAN -S --noconfirm --asdeps --needed libvirt augeas rubygems libpcap $sudo_command $PACMAN -S --noconfirm --asdeps --needed libvirt augeas rubygems libpcap
fi fi
if ! in_ci; then if ! in_ci; then
if [ ! -z "$YUM" ]; then if [ -n "$YUM" ]; then
if [ -z "$GO" ]; then if [ -z "$GO" ]; then
$sudo_command $YUM install -y golang golang-googlecode-tools-stringer || $sudo_command $YUM install -y golang-bin # centos-7 epel $sudo_command $YUM install -y golang golang-googlecode-tools-stringer || $sudo_command $YUM install -y golang-bin # centos-7 epel
fi fi
# some go dependencies are stored in mercurial # some go dependencies are stored in mercurial
$sudo_command $YUM install -y hg $sudo_command $YUM install -y hg
fi fi
if [ ! -z "$APT" ]; then if [ -n "$APT" ]; then
$sudo_command $APT update $sudo_command $APT update
if [ -z "$GO" ]; then if [ -z "$GO" ]; then
$sudo_command $APT install -y golang $sudo_command $APT install -y golang
@@ -96,13 +96,13 @@ if ! in_ci; then
fi fi
$sudo_command $APT install -y build-essential packagekit mercurial $sudo_command $APT install -y build-essential packagekit mercurial
fi fi
if [ ! -z "$PACMAN" ]; then if [ -n "$PACMAN" ]; then
$sudo_command $PACMAN -S --noconfirm --asdeps --needed go gcc pkg-config $sudo_command $PACMAN -S --noconfirm --asdeps --needed go gcc pkg-config
fi fi
fi fi
# attempt to workaround old ubuntu # attempt to workaround old ubuntu
if [ ! -z "$APT" ] && [ "$goversion" -lt "$mingoversion" ]; then if [ -n "$APT" -a "$goversion" -lt "$mingoversion" ]; then
echo "install golang from a ppa." echo "install golang from a ppa."
$sudo_command $APT remove -y golang $sudo_command $APT remove -y golang
$sudo_command $APT install -y software-properties-common # for add-apt-repository $sudo_command $APT install -y software-properties-common # for add-apt-repository