aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2023-08-31 13:44:32 +0000
committerJosh Boyer <jwboyer@redhat.com>2023-08-31 13:44:32 +0000
commit6c0973144120b604efb7101fc7342c694d4a198f (patch)
tree28e08f83adf9abdf386dee0127b4090ec3143894
parent61501389c43b6bb9b1fbb104c4ac79e7af03fcdc (diff)
parent8976d8c34d3c6dabeccafd25cf5e5a7d10f5329d (diff)
downloadlinux-firmware-6c0973144120b604efb7101fc7342c694d4a198f.tar.gz
Merge branch 'mlimonci/shellcheck' into 'main'
Enable shellcheck for pre-commit See merge request kernel-firmware/linux-firmware!5
-rw-r--r--.pre-commit-config.yaml4
-rwxr-xr-xcarl9170fw/autogen.sh3
-rwxr-xr-xcarl9170fw/genapi.sh8
3 files changed, 10 insertions, 5 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 63609924..7a49d063 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,10 @@ repos:
- id: check-yaml
- id: check-symlinks
- id: destroyed-symlinks
+- repo: https://github.com/shellcheck-py/shellcheck-py
+ rev: v0.9.0.5
+ hooks:
+ - id: shellcheck
- repo: https://github.com/ambv/black
rev: 22.6.0
hooks:
diff --git a/carl9170fw/autogen.sh b/carl9170fw/autogen.sh
index 6843f196..843209c5 100755
--- a/carl9170fw/autogen.sh
+++ b/carl9170fw/autogen.sh
@@ -23,6 +23,7 @@ case "$1" in
exit 1
fi
+ # shellcheck source=/dev/null
. ./.config
make
@@ -34,7 +35,7 @@ case "$1" in
fi
install -m 644 carlfw/carl9170.fw \
- ../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+ ../carl9170-"$CONFIG_CARL9170FW_RELEASE_VERSION".fw
echo "done."
;;
diff --git a/carl9170fw/genapi.sh b/carl9170fw/genapi.sh
index 8912cc66..ae9f330d 100755
--- a/carl9170fw/genapi.sh
+++ b/carl9170fw/genapi.sh
@@ -3,9 +3,9 @@
cat <<EOF > include/shared/version.h
#ifndef __CARL9170_SHARED_VERSION_H
#define __CARL9170_SHARED_VERSION_H
-#define CARL9170FW_VERSION_YEAR $((100`date +%Y`%100))
-#define CARL9170FW_VERSION_MONTH $((100`date +%m`%100))
-#define CARL9170FW_VERSION_DAY $((100`date +%d`%100))
-#define CARL9170FW_VERSION_GIT "`git describe 2>/dev/null`"
+#define CARL9170FW_VERSION_YEAR $((100$(date +%Y)%100))
+#define CARL9170FW_VERSION_MONTH $((100$(date +%m)%100))
+#define CARL9170FW_VERSION_DAY $((100$(date +%d)%100))
+#define CARL9170FW_VERSION_GIT $(git describe 2>/dev/null)
#endif /* __CARL9170_SHARED_VERSION_H */
EOF