Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🚨(ci) fix the shellcheck job

lebaudantoine919af928aa9b
diff --git a/bin/_config.sh b/bin/_config.sh
index f6107bda..9d35ab4e 100644
--- a/bin/_config.sh
+++ b/bin/_config.sh
@@ -55,12 +55,12 @@ function _docker_compose() {
function _dc_run() {
_set_user
- user_args="--user=$USER_ID"
- if [ -z $USER_ID ]; then
- user_args=""
+ user_args=()
+ if [ -n "$USER_ID" ]; then
+ user_args=("--user=$USER_ID")
fi
- _docker_compose run --rm $user_args "$@"
+ _docker_compose run --rm "${user_args[@]}" "$@"
}
# _dc_exec: wrap docker compose exec command
@@ -74,12 +74,12 @@ function _dc_exec() {
echo "🐳(compose) exec command: '\$@'"
- user_args="--user=$USER_ID"
- if [ -z $USER_ID ]; then
- user_args=""
+ user_args=()
+ if [ -n "$USER_ID" ]; then
+ user_args=("--user=$USER_ID")
fi
- _docker_compose exec $user_args "$@"
+ _docker_compose exec "${user_args[@]}" "$@"
}
# _django_manage: wrap django's manage.py command with docker compose
diff --git a/bin/buildpack_start.sh b/bin/buildpack_start.sh
index 64274804..9b9fc72b 100755
--- a/bin/buildpack_start.sh
+++ b/bin/buildpack_start.sh
@@ -7,7 +7,7 @@ gunicorn -b 0.0.0.0:8000 meet.wsgi:application --log-file - &
bin/run &
# if the current shell is killed, also terminate all its children
-trap "pkill SIGTERM -P $$" SIGTERM
+trap 'pkill -TERM -P $$' SIGTERM
# wait for a single child to finish,
wait -n
diff --git a/bin/install-external-secrets.sh b/bin/install-external-secrets.sh
index 6f334ef3..fbef252e 100755
--- a/bin/install-external-secrets.sh
+++ b/bin/install-external-secrets.sh
@@ -1,7 +1,6 @@
#!/usr/bin/env bash
set -o errexit
-CURRENT_DIR=$(pwd)
NAMESPACE=${1:-meet}
SECRET_NAME=${2:-bitwarden-cli-meet}
TEMP_SECRET_FILE=$(mktemp)
@@ -30,10 +29,10 @@ check_secret_exists() {
# Collect user input securely
get_user_input() {
echo "Please provide the following information:"
- read -p "Enter your Vaultwarden email login: " LOGIN
- read -s -p "Enter your Vaultwarden password: " PASSWORD
+ read -r -p "Enter your Vaultwarden email login: " LOGIN
+ read -r -s -p "Enter your Vaultwarden password: " PASSWORD
echo
- read -p "Enter your Vaultwarden server url: " URL
+ read -r -p "Enter your Vaultwarden server url: " URL
}
# Create and apply the secret
@@ -77,7 +76,7 @@ main() {
exit 0
fi
- echo -e ${TEMP_SECRET_FILE}
+ echo -e "${TEMP_SECRET_FILE}"
get_user_input
echo -e "\nCreating Vaultwarden secret…"
diff --git a/bin/install-hooks.sh b/bin/install-hooks.sh
index fef9219c..282e20b1 100755
--- a/bin/install-hooks.sh
+++ b/bin/install-hooks.sh
@@ -3,7 +3,7 @@
mkdir -p "$(dirname -- "${BASH_SOURCE[0]}")/../.git/hooks/"
PRE_COMMIT_FILE="$(dirname -- "${BASH_SOURCE[0]}")/../.git/hooks/pre-commit"
-cat <<'EOF' >$PRE_COMMIT_FILE
+cat <<'EOF' >"$PRE_COMMIT_FILE"
#!/bin/bash
# directories containing potential secrets
@@ -27,4 +27,4 @@ for d in $DIRS; do
done
EOF
-chmod +x $PRE_COMMIT_FILE
+chmod +x "$PRE_COMMIT_FILE"
diff --git a/bin/prepare-release.sh b/bin/prepare-release.sh
index 09de16d3..5b0b36ca 100755
--- a/bin/prepare-release.sh
+++ b/bin/prepare-release.sh
@@ -68,7 +68,7 @@ fi
# Ask user for release version number
echo ""
-read -p "Enter release version number (e.g., 1.2.3): " VERSION
+read -r -p "Enter release version number (e.g., 1.2.3): " VERSION
# Validate version format (basic semver check)
if ! [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
diff --git a/bin/update-git-submodule.sh b/bin/update-git-submodule.sh
index 5ec8ff05..d8c91905 100755
--- a/bin/update-git-submodule.sh
+++ b/bin/update-git-submodule.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
git submodule update --init --recursive
+# shellcheck disable=SC2016
git submodule foreach 'git fetch origin; git checkout $(git rev-parse --abbrev-ref HEAD); git reset --hard origin/$(git rev-parse --abbrev-ref HEAD); git submodule update --recursive; git clean -dfx'
diff --git a/bin/validate-helm-configuration.sh b/bin/validate-helm-configuration.sh
index 3d155664..cfe562d9 100755
--- a/bin/validate-helm-configuration.sh
+++ b/bin/validate-helm-configuration.sh
@@ -8,6 +8,6 @@ environments=$(awk '/environments:/ {flag=1; next} flag && NF {print} !NF {flag=
for env in $environments; do
echo "################### $env lint ###################"
- helmfile -e $env -f src/helm/helmfile.yaml lint || exit 1
+ helmfile -e "$env" -f src/helm/helmfile.yaml lint || exit 1
echo -e "\n"
done
diff --git a/src/helm/meet/generate-readme.sh b/src/helm/meet/generate-readme.sh
index f8060225..26426613 100755
--- a/src/helm/meet/generate-readme.sh
+++ b/src/helm/meet/generate-readme.sh
@@ -1,10 +1,9 @@
#!/usr/bin/env bash
-docker image ls | grep readme-generator-for-helm
-if [ "$?" -ne "0" ]; then
+if ! docker image ls | grep readme-generator-for-helm; then
git clone https://github.com/bitnami/readme-generator-for-helm.git /tmp/readme-generator-for-helm
- cd /tmp/readme-generator-for-helm
+ cd /tmp/readme-generator-for-helm || exit 1
docker build -t readme-generator-for-helm:latest .
- cd $(dirname -- "${BASH_SOURCE[0]}")
+ cd "$(dirname -- "${BASH_SOURCE[0]}")" || exit 1
fi
docker run --rm -it -v .:/source -w /source readme-generator-for-helm:latest readme-generator -v values.yaml -r README.md