diff --git a/vim-update.sh b/vim-update.sh index 83ac169..7a48282 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f37" "f36" "f35" ) -releases=( "fc38" "fc37" "fc36" "fc35" ) +branches=( "rawhide" "f37" "f36" ) +releases=( "fc38" "fc37" "fc36" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc38" "fc37" "\|fc36" "\|fc35" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc38" "fc37" "\|fc36" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 @@ -28,11 +28,6 @@ if [ "x$1" == "x--force" ]; then force=1 fi -if [ "x$(grep -o VERSION_ID=35 /etc/os-release)" == "xVERSION_ID=35" ] -then - BODHI_USER="--user $(id -un)" -fi - DATE=`date +"%a %b %d %Y"` $debug fedpkg switch-branch "${branches[@]: $branches_index: 1}" @@ -168,8 +163,7 @@ if [ $CHANGES -ne 0 ]; then # if branch isn't rawhide or branch is enabled in bodhi, create the update if newer branch does # not have an update in testing if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then - # uses 'id' value for updates -> your username in OS must match with your username in Fedora accounts - $debug bodhi updates new ${BODHI_USER} --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} + $debug bodhi updates new --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} fi else echo "Error when building package for $branch"