From d09c1c865cd2a753855db9c656f81b710eafc8c0 Mon Sep 17 00:00:00 2001
From: Asher Foa <asher@asherfoa.com>
Date: Tue, 3 Jun 2025 13:37:56 -0400
Subject: [PATCH] Add shell check to pre-cmmit hooks & fix issues reported by
 it (#2579)

---
 .pre-commit-config.yaml | 5 +++++
 entrypoint-skyvern.sh   | 1 -
 entrypoint-skyvernui.sh | 5 ++---
 run_alembic_check.sh    | 2 +-
 run_skyvern.sh          | 5 +++--
 run_ui.sh               | 6 +++---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e2ff239a..aa04ccd9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -97,3 +97,8 @@ repos:
         entry: ./run_alembic_check.sh
         language: script
         stages: [ manual ]
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.10.0
+    hooks:
+      - id: shellcheck
+
diff --git a/entrypoint-skyvern.sh b/entrypoint-skyvern.sh
index 7ab0caa8..d0eb8ba0 100644
--- a/entrypoint-skyvern.sh
+++ b/entrypoint-skyvern.sh
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 
 set -e
diff --git a/entrypoint-skyvernui.sh b/entrypoint-skyvernui.sh
index 348ed9a1..d4225e39 100644
--- a/entrypoint-skyvernui.sh
+++ b/entrypoint-skyvernui.sh
@@ -1,11 +1,10 @@
-
 #!/bin/bash
 
 set -e
 
 # setting api key
-export VITE_SKYVERN_API_KEY=$(sed -n 's/.*cred\s*=\s*"\([^"]*\)".*/\1/p' .streamlit/secrets.toml)
-
+VITE_SKYVERN_API_KEY=$(sed -n 's/.*cred\s*=\s*"\([^"]*\)".*/\1/p' .streamlit/secrets.toml)
+export VITE_SKYVERN_API_KEY
 npm run start
 
 
diff --git a/run_alembic_check.sh b/run_alembic_check.sh
index 83e05c9f..f5cc5377 100755
--- a/run_alembic_check.sh
+++ b/run_alembic_check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # first apply migrations
-export PATH=$PATH:.venv/bin
+export PATH="${PATH}:.venv/bin"
 alembic upgrade head
 # then check if the database is up to date with the models
 alembic check
diff --git a/run_skyvern.sh b/run_skyvern.sh
index fe20dac4..1295705c 100755
--- a/run_skyvern.sh
+++ b/run_skyvern.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 
 pid=$(lsof -t -i :8000)
-if [ ! -z "$pid" ]; then
-  kill $pid
+if [ -n "$pid" ]; then
+  kill "$pid"
 fi
 
 if [ ! -f .env ]; then
   cp .env.example .env
   echo "Please add your api keys to the .env file."
 fi
+# shellcheck source=/dev/null
 source "$(poetry env info --path)/bin/activate"
 poetry install
 ./run_alembic_check.sh
diff --git a/run_ui.sh b/run_ui.sh
index 267cb220..d4942cea 100755
--- a/run_ui.sh
+++ b/run_ui.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 pid=$(lsof -t -i :8080)
-if [ ! -z "$pid" ]; then
-  kill $pid
+if [ -n "$pid" ]; then
+  kill "$pid"
 fi
 
-cd skyvern-frontend
+cd skyvern-frontend || exit 1
 
 if [ ! -f .env ]; then
   cp .env.example .env