diff options
-rwxr-xr-x | scripts/review | 21 | ||||
-rw-r--r-- | scripts/use_desc_gen.sh | 3 |
2 files changed, 20 insertions, 4 deletions
diff --git a/scripts/review b/scripts/review index 3499f0713..54c7e748a 100755 --- a/scripts/review +++ b/scripts/review @@ -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 diff --git a/scripts/use_desc_gen.sh b/scripts/use_desc_gen.sh index 0cdd976d0..02e48b5e9 100644 --- a/scripts/use_desc_gen.sh +++ b/scripts/use_desc_gen.sh @@ -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 |