Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update scripts to find correct bash path
Some distributions have bash installed under a different path than
`/bin`, which can be retrieved via `env`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
  • Loading branch information
saschagrunert committed May 17, 2019
1 parent 424bb15 commit d0a128d
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion hack/apparmor_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
if pkg-config libapparmor 2> /dev/null ; then
echo apparmor
fi
2 changes: 1 addition & 1 deletion hack/btrfs_installed_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
cc -E - > /dev/null 2> /dev/null << EOF
#include <btrfs/ioctl.h>
EOF
Expand Down
2 changes: 1 addition & 1 deletion hack/btrfs_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
cc -E - > /dev/null 2> /dev/null << EOF
#include <btrfs/version.h>
EOF
Expand Down
2 changes: 1 addition & 1 deletion hack/libdm_installed.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
cc -E - > /dev/null 2> /dev/null << EOF
#include <libdevmapper.h>
EOF
Expand Down
2 changes: 1 addition & 1 deletion hack/libdm_no_deferred_remove_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
tmpdir="$PWD/tmp.$RANDOM"
mkdir -p "$tmpdir"
trap 'rm -fr "$tmpdir"' EXIT
Expand Down
2 changes: 1 addition & 1 deletion hack/openpgp_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
if ! gpgme-config --libs &>/dev/null; then
echo containers_image_openpgp
fi
2 changes: 1 addition & 1 deletion hack/seccomp_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
if pkg-config libseccomp 2> /dev/null ; then
echo seccomp
fi
2 changes: 1 addition & 1 deletion hack/selinux_tag.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
if pkg-config libselinux 2> /dev/null ; then
echo selinux
fi
2 changes: 1 addition & 1 deletion hack/tree_status.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e

STATUS=$(git status --porcelain)
Expand Down
2 changes: 1 addition & 1 deletion test/cni_plugin_helper.bash
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# This script wraps the CNI 'bridge' plugin to provide additional testing
# capabilities
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.bash
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Root directory of integration tests.
INTEGRATION_ROOT=$(dirname "$(readlink -f "$BASH_SOURCE")")
Expand Down

0 comments on commit d0a128d

Please sign in to comment.