X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=blobdiff_plain;f=relup.sh;h=7557ba619b1282596364914aa6d253ba8159fbea;hp=9a07402e5bfc5f0a574a31c602f59cd8f45de329;hb=f8a24e0ba6f0a677b7b4626b6a1085ba966b0959;hpb=bbe9c10ae848838adafe5772aec8f8b9624c4432 diff --git a/relup.sh b/relup.sh index 9a07402..7557ba6 100755 --- a/relup.sh +++ b/relup.sh @@ -77,6 +77,8 @@ bump_release() { package_name() { local specfile="${1%/}" package + # strip branch + specfile=${specfile%:*} # basename specfile=${specfile##*/} # strip .spec @@ -85,6 +87,18 @@ package_name() { echo $package } +get_branch() { + local specfile="${1%/}" branch + + branch=${specfile#*:} + + if [ "$branch" != "$specfile" ]; then + echo "$branch" + else + echo "" + fi +} + if [ ! -x /usr/bin/getopt ]; then echo >&1 "You need to install util-linux to use relup.sh" exit 1 @@ -135,6 +149,7 @@ n="${n%%n}" cd "$topdir" for pkg in "$@"; do + branch=$(get_branch "$pkg") # pkg: package %{name} pkg=$(package_name "$pkg") @@ -149,13 +164,21 @@ for pkg in "$@"; do specname=${spec##*/} # start real work - echo "$pkg ..." + if [ -n "$branch" ]; then + echo "$pkg:$branch ..." + else + echo "$pkg ..." + fi # get package [ "$get" = 1 -a -d "$pkgdir" ] && continue if [ "$update" = "1" -o "$get" = "1" ]; then - ./builder -g -ns "$spec" + if [ -n "$branch" ]; then + ./builder -g -ns "$spec" -r $branch + else + ./builder -g -ns "$spec" + fi fi [ "$get" = 1 ] && continue