Args parsing and few fixes.

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 2daade8e6eb278a629bd93cfdd854139488922b3..f94b0a30ffcc6dc75520f48114c0f1e3d12a9123 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -40,7 +40,8 @@ VERSIONSTRING="\
 Build package utility from PLD Linux Packages repository
 $VERSION (C) 1999-2020 Free Penguins".
 
-CLEAN_PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
+# Clean PATH without /usr/local or user paths
+CLEAN_PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
 
 # required rpm-build-macros
 RPM_MACROS_VER=1.534
@@ -478,9 +479,9 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
 is_rpmorg() {
        local v
 
-       v=$(rpm --version 2>&1)
+       v=$(LC_ALL=C LANG=C rpm --version 2>&1)
        v=${v#RPM version } # rpm 4
-       v=${v#rpm (RPM) } # rpm 5
+       v=${v#rpm \(RPM\) } # rpm 5
 
        case "$v" in
                4.5|5.*)
@@ -489,6 +490,9 @@ is_rpmorg() {
                4.*)
                        return 0;
                        ;;
+               *)
+                       echo "ERROR: unsupported RPM version $v" >&2
+                       exit 1
        esac
 }
 
@@ -1824,7 +1828,7 @@ set_bconds_values() {
                without_*)
                        bcond=${opt#without_}
                        case "$BCOND" in
-                       *--without?${bcond}*)
+                       *--without?${bcond}\ *|*--without?${bcond})
                                AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$bcond>"
                                ;;
                        *)
@@ -1835,7 +1839,7 @@ set_bconds_values() {
                with_*)
                        bcond=${opt#with_}
                        case "$BCOND" in
-                       *--with?${bcond}*)
+                       *--with?${bcond}\ *|*--with?${bcond})
                                AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$bcond>"
                                ;;
                        *)
@@ -1892,7 +1896,7 @@ run_sub_builder() {
 # this requires following sudo rules:
 # - poldek --noask --caplookup -ug
 poldek_install() {
-       LANG=C $POLDEK_CMD --noask --caplookup --uniq -ug "$@"
+       LC_ALL=C LANG=C $POLDEK_CMD --noask --caplookup --uniq -ug "$@"
 }
 
 # install packages
@@ -2021,7 +2025,7 @@ _rpm_cnfl_check() {
                DEPS=$(cat)
        fi
 
-       LANG=C rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
+       LC_ALL=C LANG=C rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
 }
 
 # install deps via information from 'rpm-getdeps' or 'rpm --specsrpm'