From 493f56fc435d57789d0b8e317b2cde9f4cd30567 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 20 Nov 2013 19:50:50 +0900 Subject: [PATCH] test-rebuild.sh: drop branch arg and switch to os version branch need to support epel later --- tests/test-rebuild.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test-rebuild.sh b/tests/test-rebuild.sh index f665523..2c5169f 100755 --- a/tests/test-rebuild.sh +++ b/tests/test-rebuild.sh @@ -4,7 +4,7 @@ # In a pkg dir run # $ ./test-rebuild.sh # or clone a pkg branch: -# $ ./test-rebuild.sh [pkg] [branch] +# $ ./test-rebuild.sh [pkg] set -e @@ -22,12 +22,12 @@ ARCH=$(arch) #fi eval $(grep VERSION_ID /etc/os-release) -BRANCH="f$VERSION_ID" +case $VERSION_ID in + 21) BRANCH=master ;; + *) BRANCH="f$VERSION_ID" ;; +esac -# maybe use BRANCH here too? -if [ -n "$2" ]; then - fedpkg switch-branch $2 -fi +fedpkg switch-branch $BRANCH if [ "* $BRANCH" != "$(git branch --list $BRANCH)" ]; then echo "Git branch does not match Fedora installation!"