summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-11-13 14:32:52 +1000
committerAllan McRae <allan@archlinux.org>2015-11-23 11:13:39 +1000
commitc26e5b81e5c22e1316eb2f384cc175438772a8f2 (patch)
tree946a14ece82a6e099fa04eb14fe0f7a5a3da4048
parent947dfda515505f937eac5b388384dd6df0278e40 (diff)
downloadpacman-c26e5b81e5c22e1316eb2f384cc175438772a8f2.tar.xz
lint_pkgbuild: explicitly return value
Set the return value to be local and always explictly returns it. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/arch.sh.in2
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/changelog.sh.in4
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/install.sh.in4
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in4
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/util.sh.in2
5 files changed, 12 insertions, 4 deletions
diff --git a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in
index b8a8c302..f217515f 100644
--- a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in
@@ -31,7 +31,7 @@ lint_pkgbuild_functions+=('lint_arch')
lint_arch() {
- local a name list
+ local a name list ret=0
if [[ $arch == 'any' ]]; then
return 0
diff --git a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in
index 72300a48..70959d07 100644
--- a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in
@@ -41,5 +41,7 @@ lint_changelog() {
fi
done
- check_files_exist 'changelog' "${changelog_list[@]}"
+ check_files_exist 'changelog' "${changelog_list[@]}" || ret=1
+
+ return $ret
}
diff --git a/scripts/libmakepkg/lint_pkgbuild/install.sh.in b/scripts/libmakepkg/lint_pkgbuild/install.sh.in
index 21e0bfb7..8e5c1158 100644
--- a/scripts/libmakepkg/lint_pkgbuild/install.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/install.sh.in
@@ -40,5 +40,7 @@ lint_install() {
install_list+=("$file")
done
- check_files_exist 'install' "${install_list[@]}"
+ check_files_exist 'install' "${install_list[@]}" || ret=1
+
+ return $ret
}
diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in
index 0d4361cc..53f89ce6 100644
--- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in
@@ -30,6 +30,8 @@ lint_pkgbuild_functions+=('lint_pkgbase')
lint_pkgbase() {
+ local ret=0
+
if [[ ${pkgbase:0:1} = "-" ]]; then
error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname"
return 1
@@ -43,4 +45,6 @@ lint_pkgbase() {
'pkgbase' "${i//[[:alnum:]+_.@-]}"
ret=1
fi
+
+ return $ret
}
diff --git a/scripts/libmakepkg/lint_pkgbuild/util.sh.in b/scripts/libmakepkg/lint_pkgbuild/util.sh.in
index 448abc8a..8760eb68 100644
--- a/scripts/libmakepkg/lint_pkgbuild/util.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/util.sh.in
@@ -27,7 +27,7 @@ source "$LIBRARY/util/message.sh"
check_files_exist() {
- local kind=$1 files=("${@:2}") file ret
+ local kind=$1 files=("${@:2}") file ret=0
for file in "${files[@]}"; do
if [[ $file && ! -f $file ]]; then