fix rpmbsh options order handling

bin/rpmbps

@@ -133,6 +133,7 @@ else
 	docmd $ETERBUILDBIN/rpmcs --skip-reqs $SPECNAME
 
 	BUILDREQ="BuildRequires:"
+	# Korinf hack
 	if [ $(basename $SPECNAME) != "eepm.spec" ] ; then
 		if ! grep -q "BuildRequires:.*rpm-build-altlinux-compat" $SPECNAME ; then
 			# Need our compat package and disable strong patch checking

bin/rpmbsh

@@ -38,19 +38,21 @@ phelp()
 	echog "   -t  make temporary commit before build (rpmbb like behavior)"
 	echog "   -l  lazy cleanup (clean before build, not after)"
 	echog "   -w  build with gear --hasher myhsh directly"
-	echog "   -b REPONAME  binary repository name (4.1, p5, t6 and so on)"
+	echog "   -b REPONAME  binary repository name (p6, t6, c7, p8 and so on)"
 }
 
-while getopts :hitwb: opt; do
+PASSEDARGS=
+while getopts :hiufclstwb: opt; do
     case $opt in
     h) phelp; exit 0;;
     t) COMMIT="--commit" ;;
+    u|f|c|s|l) PASSEDARGS="$PASSEDARGS -$opt" ;;
     w) THOROUGH=1 ;;
     i) INSTALLPKG=1 ;;
     b) BINARYREPONAME=$OPTARG ;;
     +?) echog "$name: options should not be preceded by a '+'." 1>&2; exit 2;;
 #    ?)  echog "$name: $OPTARG: bad option.  Use -h for help." 1>&2 ; exit 2;;
-	?) OPTIND=$((OPTIND-1)); break;
+    ?) OPTIND=$(($OPTIND-1)); break;
     esac
 done
 
@@ -59,7 +61,7 @@ if [ $# -gt 0 ]; then
 	[ "$OPTIND" -gt 0 ] && shift $(($OPTIND - 1))
 fi
 
-LISTRPMARGS=$@
+LISTRPMARGS="$PASSEDARGS $*"
 
 }
 #############################
@@ -96,7 +98,7 @@ else
 	RESULT=$?
 fi
 
-# if ok and requested test install, do it
+# if ok and test install is requested, do it
 if [ "$RESULT" = "0" ] && [ -n "$INSTALLPKG" ] ; then
 	BINPACKAGES=$($ETERBUILDBIN/myhsh $MENVARG -b $LISTBUILT | estrlist reg_exclude debuginfo -) || fatal "Can't get binary packages for $LISTBUILT"