From 41b8e6918d2c1b8638819877b96a2b8bdc1b4301 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Fri, 19 Apr 2019 14:51:01 +0200 Subject: [PATCH] move shellcheck.files up --- dev/hooks/pre-commit.sh | 6 +++--- dev/hooks/pre-push.sh | 2 +- dev/install-hooks.sh | 2 +- dev/{hooks => }/shellcheck.files | 8 ++++---- dev/version.sh | 2 +- doc/1_firstbot.md | 2 +- doc/2_usage.md | 2 +- doc/3_advanced.md | 2 +- doc/4_expert.md | 2 +- doc/5_practice.md | 2 +- doc/6_reference.md | 2 +- doc/7_develop.md | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) rename dev/{hooks => }/shellcheck.files (68%) diff --git a/dev/hooks/pre-commit.sh b/dev/hooks/pre-commit.sh index 4f6d6e5..dfc4a6a 100755 --- a/dev/hooks/pre-commit.sh +++ b/dev/hooks/pre-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script @@ -28,8 +28,8 @@ else fi # run shellcheck before commit -echo "read files from ${HOOKDIR}/shellcheck.files ..." -FILES=$(sed '/^#/d' <"${HOOKDIR}/shellcheck.files") +echo "read files from dev/shellcheck.files ..." +FILES=$(sed '/^#/d' <"dev/shellcheck.files") if [ "$FILES" != "" ]; then # shellcheck disable=SC2086 shellcheck -x ${FILES} || exit 1 diff --git a/dev/hooks/pre-push.sh b/dev/hooks/pre-push.sh index 2276f28..2f68e43 100755 --- a/dev/hooks/pre-push.sh +++ b/dev/hooks/pre-push.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script diff --git a/dev/install-hooks.sh b/dev/install-hooks.sh index f9289b8..2cc2bc2 100755 --- a/dev/install-hooks.sh +++ b/dev/install-hooks.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # this has to run once atfer git clone # and every time we create new hooks -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script diff --git a/dev/hooks/shellcheck.files b/dev/shellcheck.files similarity index 68% rename from dev/hooks/shellcheck.files rename to dev/shellcheck.files index f2e257b..70769c7 100644 --- a/dev/hooks/shellcheck.files +++ b/dev/shellcheck.files @@ -1,13 +1,13 @@ # list of files to run shellscheck against -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c # main files bashbot.sh commands.sh bashbot.rc # example files -examples/calc -examples/notify -examples/question +examples/calc.sh +examples/notify.sh +examples/question.sh # dev files dev/version.sh dev/install-hooks.sh diff --git a/dev/version.sh b/dev/version.sh index 7906fe1..1310b62 100755 --- a/dev/version.sh +++ b/dev/version.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c # shellcheck disable=SC2016 # # Easy Versioning in git: diff --git a/doc/1_firstbot.md b/doc/1_firstbot.md index 8a36d5a..3b9a6af 100644 --- a/doc/1_firstbot.md +++ b/doc/1_firstbot.md @@ -61,5 +61,5 @@ group. This step is up to you actually. #### [Next Getting started](2_usage.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c diff --git a/doc/2_usage.md b/doc/2_usage.md index c6dca6f..3374fa8 100644 --- a/doc/2_usage.md +++ b/doc/2_usage.md @@ -159,5 +159,5 @@ send_action "${CHAT[ID]}" "action" #### [Prev Create Bot](1_firstbot.md) #### [Next Advanced Usage](3_advanced.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c diff --git a/doc/3_advanced.md b/doc/3_advanced.md index fd90984..2615edb 100644 --- a/doc/3_advanced.md +++ b/doc/3_advanced.md @@ -156,5 +156,5 @@ answer_inline_query "$iQUERY_ID" "cached_sticker" "identifier for the sticker" #### [Prev Advanced Usage](3_advanced.md) #### [Next Expert Use](4_expert.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c diff --git a/doc/4_expert.md b/doc/4_expert.md index a532dbd..d42b34a 100644 --- a/doc/4_expert.md +++ b/doc/4_expert.md @@ -104,5 +104,5 @@ An example crontab is provided in ```examples/bashbot.cron```. #### [Prev Expert Use](4_expert.md) #### [Next Best Practice](5_practice.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c diff --git a/doc/5_practice.md b/doc/5_practice.md index 58c5913..5a66418 100644 --- a/doc/5_practice.md +++ b/doc/5_practice.md @@ -112,5 +112,5 @@ The second warning is about an unused variable, this is true because in our exam #### [Prev Best Practice](5_practice.md) #### [Next Functions Reference](6_reference.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c diff --git a/doc/6_reference.md b/doc/6_reference.md index 36bb197..c3865e0 100644 --- a/doc/6_reference.md +++ b/doc/6_reference.md @@ -348,5 +348,5 @@ Send Input from Telegram to waiting Interactive Chat. #### [Prev Best Practice](5_practice.md) #### [Next Developer Rules](7_develop.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c diff --git a/doc/7_develop.md b/doc/7_develop.md index 8d95e7e..a4c2d1e 100644 --- a/doc/7_develop.md +++ b/doc/7_develop.md @@ -28,10 +28,10 @@ If you actived git hooks in Setup step 6, 'version.sh' updates the version name For a shell script running as a service it's important to be paranoid about quoting, globbing and other common problems. So it's a must to run shellchek on all shell scripts before you commit a change. this is automated by a git hook activated in Setup step 6. -In addition you can run ```dev/hooks/pre-commit.sh``` every time you want to shellcheck all files given in 'dev/hooks/shellcheck.files'. +In addition you can run ```dev/hooks/pre-commit.sh``` every time you want to shellcheck all files given in 'dev/shellcheck.files'. #### [Prev Function Reference](6_function.md) -#### $$VERSION$$ v0.61-0-g3b17bc2 +#### $$VERSION$$ v0.61-2-gfd4dd8c