scripts/F11-buildinstall | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
New commits:
commit a5e23e16946cc79928f74ec0b3caf1fdf5399574
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sat Jul 4 21:20:50 2009 +0200
Every parameter passed that starts with a "/" and is not an option (--option option) is now the output directory
diff --git a/scripts/F11-buildinstall b/scripts/F11-buildinstall
index c076b2d..3a3deb6 100755
--- a/scripts/F11-buildinstall
+++ b/scripts/F11-buildinstall
@@ -67,10 +67,6 @@ while [ $# -gt 0 ]; do
BUGURL=$2
shift; shift
;;
- --output)
- OUTPUT=$2
- shift; shift
- ;;
--updates)
UPDATES=$2
shift; shift
@@ -86,9 +82,14 @@ while [ $# -gt 0 ]; do
;;
*)
- if [ -z "$REPO" ]; then
+ if [[ "$1" =~ ^/ ]]; then
+ # This is the output directory
+ OUTPUT=$1
+ elif [ -z "$REPO" ]; then
+ # This is the first repository
REPO=$1
else
+ # These are additional repositories
EXTRA_REPOS="$EXTRA_REPOS $1"
fi
shift
@@ -116,11 +117,6 @@ if [ -z "$BUGURL" ]; then
BUGURL="your distribution provided bug reporting tool."
fi
-if [[ "$REPO" =~ ^/ ]]; then
- [ -n "$OUTPUT" ] || OUTPUT=$REPO
- REPO="file://$REPO"
-fi
-
if [ -z "$OUTPUT" ]; then
usage
fi