diff options
| -rw-r--r-- | scripts/.gitignore | 1 | ||||
| -rwxr-xr-x | scripts/cronjob.sh | 37 | ||||
| -rwxr-xr-x | scripts/update-gcc | 2 | ||||
| -rwxr-xr-x | scripts/update-gdb | 2 |
4 files changed, 16 insertions, 26 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 0000000..913d141 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1 @@ +cronjob.log diff --git a/scripts/cronjob.sh b/scripts/cronjob.sh index 3938172..a009055 100755 --- a/scripts/cronjob.sh +++ b/scripts/cronjob.sh @@ -7,45 +7,34 @@ NCPUS=$(getconf _NPROCESSORS_ONLN) set -e cd "${0%/*}"/.. -svn_commit() { - # Just in case someone else made a commit before we did. - svn up -q - - # Need the force as newer svn versions (1.7) don't like being - # given files that already exist. - svn add -q --force * || : - - local st=$(svn st .) - - local d=$(echo "${st}" | awk '$1 ~ /^[!?]/ { print $NF }') - if [[ -n ${d} ]] ; then - svn rm ${d} - fi - - if [[ -z $(svn st . | grep -v '[^AM]') ]] ; then - svn commit -m "$1" . - fi +commit() { + git add . + git commit -a -m "$1" . } doit() { ./scripts/update-$1 cd sys-devel/$1 - svn_commit "update $1 snapshots" + commit "update $1 snapshots" cd ../.. } main() { ( - # XXX: Maybe add broken lock/cleanup detection? - svn upgrade || : - svn revert -R . - svn up -q + git reset --hard origin/master + git checkout -f + git pull doit gcc doit gdb egencache --repo=toolchain --update --portdir-overlay="${PWD}" -j ${NCPUS:-1} cd metadata - svn_commit "update metadata" + commit "update metadata" + + # Just in case someone else made a commit before we did. + git pull --rebase + + git push ) >& scripts/cronjob.log } main "$@" diff --git a/scripts/update-gcc b/scripts/update-gcc index acb6e29..1d4d126 100755 --- a/scripts/update-gcc +++ b/scripts/update-gcc @@ -33,7 +33,7 @@ for e in ${ebuilds} ; do if grep -q "\<${v}$" ${l} ; then continue fi - svn rm ${e} + git rm -f ${e} done # Then load new ones. diff --git a/scripts/update-gdb b/scripts/update-gdb index 0579d7e..8ade88a 100755 --- a/scripts/update-gdb +++ b/scripts/update-gdb @@ -33,7 +33,7 @@ for e in ${ebuilds} ; do if grep -q "\<${f}$" ${l} ; then continue fi - svn rm ${e} + git rm -f ${e} done # Then load new ones. |