Commit f3713957 authored by Leo's avatar Leo

fixes and cleanups

parent 3712dcee
......@@ -138,21 +138,6 @@ ret=0
for apkbuild; do
if [ -f "$apkbuild" ]; then
# Try to guess the repo, first see if our working directory is where
# the repo is located
_repo="${PWD%/*}"
_repo="${repo%/*}"
_repo="${repo##*/}"
case "$repo" in
main|community|testing|unmaintained) ;;
# Then have the path given to use be used
*)
_repo="${apkbuild%/*}"
_repo="${repo%/*}"
_repo="${repo##*/}"
;;
esac
# Source apkbuild, we need some nice values
srcdir="" . "$apkbuild" 2>/dev/null
default_builddir_value &
......@@ -170,10 +155,6 @@ for apkbuild; do
space_after_function_parenthesis &
newline_opening_brace &
if [ -z "$SKIP_DUPLICATE_PACKAGE" ]; then
duplicate_package &
fi
# Don't perform these checks on packages from main
if ! [ -z "${apkbuild##*main/*}" ]; then
for phase in prepare build check package; do
......
......@@ -126,15 +126,15 @@ for apkbuild; do
# Try to guess the repo, first see if our working directory is where
# the repo is located
_repo="${PWD%/*}"
_repo="${repo%/*}"
_repo="${repo##*/}"
case "$repo" in
_repo="${_repo%/*}"
_repo="${_repo##*/}"
case "$_repo" in
main|community|testing|unmaintained) ;;
# Then have the path given to use be used
*)
_repo="${apkbuild%/*}"
_repo="${repo%/*}"
_repo="${repo##*/}"
_repo="${_repo%/*}"
_repo="${_repo##*/}"
;;
esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment