diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/err.sh | 12 | ||||
| -rwxr-xr-x | include/git.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/err.sh b/include/err.sh index 595d6c77..3699d6ce 100755 --- a/include/err.sh +++ b/include/err.sh @@ -36,23 +36,23 @@ git_err() check_project() { - read projectname < projectname || : + read -r projectname < projectname || : - [ ! -f version ] || read version < version || : + [ ! -f version ] || read -r version < version || : version_="${version}" [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}" - [ ! -f versiondate ] || read versiondate < versiondate || : + [ ! -f versiondate ] || read -r versiondate < versiondate || : versiondate_="${versiondate}" [ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \ --pretty='%ct' HEAD)" || versiondate="${versiondate_}" - [ ! -z ${versiondate} ] || fail "Unknown version date" || \ + [ -n "${versiondate}" ] || fail "Unknown version date" || \ err "Unknown version date" - [ ! -z ${version} ] || fail "Unknown version" || \ + [ -n "${version}" ] || fail "Unknown version" || \ err "Unknown version" - [ ! -z ${projectname} ] || fail "Unknown project" || \ + [ -n "${projectname}" ] || fail "Unknown project" || \ err "Unknown project" xx_ printf "%s\n" "${version}" > version || \ diff --git a/include/git.sh b/include/git.sh index 811b298a..9a73bd92 100755 --- a/include/git.sh +++ b/include/git.sh @@ -123,7 +123,7 @@ clone_project() [ "${patchfail}" = "y" ] && err "PATCH FAIL" x_ rm -Rf "${loc}" - [ "${loc}" = "${loc%/*}" ] || x_ mkdir -p ${loc%/*} + [ "${loc}" = "${loc%/*}" ] || x_ mkdir -p "${loc%/*}" mv "${tmp_git_dir}" "${loc}" || \ err "clone_project: !mv ${tmp_git_dir} ${loc}" } |