Skip to content

Commit

Permalink
update shellcheck
Browse files Browse the repository at this point in the history
Signed-off-by: Jess Frazelle <[email protected]>
  • Loading branch information
jessfraz committed Sep 24, 2018
1 parent 55513d4 commit 7b5ef71
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion shellcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail
ERRORS=()

# find all executables and run `shellcheck`
for f in $(find . -type f -not -iwholename '*.git*' | sort -u); do
for f in $(find . -type f -not -iwholename '*.git*' -not -name "Dockerfile" | sort -u); do
if file "$f" | grep --quiet shell; then
{
shellcheck "$f" && echo "[OK]: sucessfully linted $f"
Expand Down
6 changes: 3 additions & 3 deletions slapd/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
set -e
set -o pipefail

: LDAP_ROOTPASS=${LDAP_ROOTPASS}
: LDAP_DOMAIN=${LDAP_DOMAIN}
: LDAP_ORGANIZATION=${LDAP_ORGANIZATION}
: LDAP_ROOTPASS="${LDAP_ROOTPASS}"
: LDAP_DOMAIN="${LDAP_DOMAIN}"
: LDAP_ORGANIZATION="${LDAP_ORGANIZATION}"

if [ ! -e /var/lib/ldap/docker_bootstrapped ]; then
echo "configuring slapd for first run"
Expand Down
12 changes: 6 additions & 6 deletions sublime-text-3/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ set -o pipefail
COMMAND=/opt/sublime_text/sublime_text

if [ -z ${NEWUSER+x} ]; then
echo 'WARN: No user was defined, defaulting to root.'
echo 'WARN: Sublime will save files as root:root.'
echo ' To prevent this, start the container with -e NEWUSER=$USER'
exec $COMMAND -w
echo "WARN: No user was defined, defaulting to root."
echo "WARN: Sublime will save files as root:root."
echo " To prevent this, start the container with -e NEWUSER=\$USER"
exec "$COMMAND" -w
else
# The root user already exists, so we only need to do something if
# a user has been specified.
useradd -s /bin/bash $NEWUSER
useradd -s /bin/bash "$NEWUSER"
# If you'd like to have Sublime Text add your development folder
# to the current project (i.e. in the sidebar at start), append
# "-a /home/$NEWUSER/Documents" (without quotes) into the su -c command below.
# Example: su $NEWUSER -c "$COMMAND -w -a /home/$NEWUSER/Documents"
su $NEWUSER -c "$COMMAND -w"
su "$NEWUSER" -c "$COMMAND -w"
fi
3 changes: 2 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ validate_diff() {

# get the dockerfiles changed
IFS=$'\n'
# shellcheck disable=SC2207
files=( $(validate_diff --name-only -- '*Dockerfile') )
unset IFS

Expand All @@ -44,7 +45,7 @@ for f in "${files[@]}"; do

(
set -x
docker build -t ${base}:${suite} ${build_dir}
docker build -t "${base}:${suite}" "${build_dir}"
)

echo " --- "
Expand Down

0 comments on commit 7b5ef71

Please sign in to comment.