Archives/gitwatch
2
0
Fork 0
mirror of https://github.com/gitwatch/gitwatch synced 2024-11-15 06:12:52 +00:00
Code Issues Projects Releases Wiki Activity

Apply fixes for some of shellcheck warnings

Browse Source
This commit is contained in:
Andrey Astafyev 2019-02-15 12:43:24 +03:00
parent 276a8e931b
commit 00c26dde5c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gitwatch.sh
View File

@ -112,15 +112,15 @@ stderr () {
# clean up at end of program, killing the remaining sleep process if it still exists
cleanup () {
if [[ -n "$SLEEP_PID" ]] && kill -0 $SLEEP_PID &>/dev/null; then
kill $SLEEP_PID &>/dev/null
if [[ -n "$SLEEP_PID" ]] && kill -0 "$SLEEP_PID" &>/dev/null; then
kill "$SLEEP_PID" &>/dev/null
fi
exit 0
}
# Tests for the availability of a command
is_command () {
which "$1" &>/dev/null
which "$1" &>/dev/null
}
###############################################################################
@ -244,8 +244,7 @@ if [ -n "$REMOTE" ]; then # are we pushing to a remote?
PUSH_CMD="$GIT push $REMOTE" # Branch not set, push to remote without a branch
else
# check if we are on a detached HEAD
HEADREF=$($GIT symbolic-ref HEAD 2> /dev/null)
if [ $? -eq 0 ]; then # HEAD is not detached
if HEADREF=$($GIT symbolic-ref HEAD 2> /dev/null); then # HEAD is not detached
PUSH_CMD="$GIT push $REMOTE $(sed "s_^refs/heads/__" <<< "$HEADREF"):$BRANCH"
else # HEAD is detached
PUSH_CMD="$GIT push $REMOTE $BRANCH"
@ -302,7 +301,7 @@ eval $INCOMMAND | while read -r line; do
# start timeout process
(
sleep $SLEEP_TIME # wait some more seconds to give apps time to write out all changes
sleep "$SLEEP_TIME" # wait some more seconds to give apps time to write out all changes
if [ -n "$DATE_FMT" ]; then
FORMATTED_COMMITMSG="$(sed "s/%d/$(date "$DATE_FMT")/" <<< "$COMMITMSG")" # splice the formatted date-time into the commit message