]> Pileus Git - ~andy/sunrise/commitdiff
scripts/review: Add update to use.local.desc to review script
authorThomas Sachau <tommy@gentoo.org>
Mon, 8 Sep 2008 20:17:01 +0000 (20:17 +0000)
committerThomas Sachau <tommy@gentoo.org>
Mon, 8 Sep 2008 20:17:01 +0000 (20:17 +0000)
svn path=/sunrise/; revision=7032

scripts/review
scripts/use_desc_gen.sh

index 3499f07131681f96327f987f6408a1cab9f0f21f..54c7e748a03e9cbebc5cb80c8fd65d1652742248 100755 (executable)
@@ -90,6 +90,25 @@ while [[ $# > 0 ]] ; do
        esac
 done
 
+cd sunrise
+sh scripts/use_desc_gen.sh .
+if [[ $(svn diff profiles/use.local.desc) ]]; then
+       svn diff profiles/use.local.desc | if [[ "$opt_quiet" == "0" ]] ; then less; else cat; fi
+       echo -n "${BOLD}Commit changes?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
+       read choice
+       echo
+       case "$choice" in
+               y*|Y*|"")
+                       svn commit -m "Automatic update to use.local.desc" profiles/use.local.desc || exit
+                       ;;
+                       *)
+                       echo "Quitting."
+                       echo
+                       exit ;;
+       esac
+fi
+cd ..
+
 if [[ -z "$*" ]] ; then
        ebegin "Updating working copy to latest version from repository"
        update=$(svn_up)
@@ -97,7 +116,7 @@ if [[ -z "$*" ]] ; then
                echo $update
        fi
        update=$(echo $update | tail -n 1)
-       update=${update/At revision }
+       update=${update/Revision }
        sunrise_revision=${update/.}
        [ "$sunrise_revision" -lt "10" ] && exit 1
        eend
index 0cdd976d08a9cf84d9bc9441796c48fac31b2127..02e48b5e93d9bbd513d3e474c24b3539fe6449ec 100644 (file)
@@ -56,6 +56,3 @@ sort -t: -k1,1 -k2 /tmp/${pid}.new.use | sort -s -t/ -k1,1 \
 rm -rf /tmp/${pid}.new.use
 
 mv /tmp/${pid}.use.local.desc profiles/use.local.desc
-if [[ $(svn diff profiles/use.local.desc) ]]; then 
-       svn commit -m "Automatic update to use.local.desc" profiles/use.local.desc;
-fi