Mercurial > hg > soundsoftware-site
changeset 435:897979555864 cannam-pre-20110113-merge
Merge from branch "live"
| author | Chris Cannam |
|---|---|
| date | Mon, 06 Jun 2011 10:58:52 +0100 |
| parents | 3d2f1bea385a (current diff) dcf38f417f1f (diff) |
| children | 4eb486dbf730 34214e593c67 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/config/locales/en.yml Tue May 10 11:57:54 2011 +0100 +++ b/config/locales/en.yml Mon Jun 06 10:58:52 2011 +0100 @@ -441,7 +441,7 @@ project_module_boards: Forums project_module_calendar: Calendar project_module_gantt: Gantt chart - project_module_embedded: Embedded documentation (Javadoc or Doxygen) + project_module_embedded: Embedded documentation (Javadoc, Doxygen or MATLAB) label_tipoftheday: Tip of the day label_notifications: Important Message field_terms_and_conditions: 'Terms and Conditions:'
--- a/extra/soundsoftware/update-external-repo.sh Tue May 10 11:57:54 2011 +0100 +++ b/extra/soundsoftware/update-external-repo.sh Mon Jun 06 10:58:52 2011 +0100 @@ -1,7 +1,7 @@ #!/bin/sh mirrordir="/var/mirror" -logfile="/var/www/test-cannam/log/update-external-repo.log" +hg="/usr/local/bin/hg" project="$1" local_repo="$2" @@ -66,9 +66,9 @@ echo "$$: Mirror for project $project exists at $project_repo_mirror, updating" 1>&2 if [ -d "$project_repo_mirror/.hg" ]; then - hg --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" && success=true + "$hg" --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" && success=true elif [ -d "$project_repo_mirror/.git" ]; then - ( cd "$project_repo_mirror" && git fetch "$remote_repo" ) && success=true + ( cd "$project_repo_mirror" && git pull "$remote_repo" master ) && success=true else echo "$$: ERROR: Repo mirror dir $project_repo_mirror exists but is not an Hg or git repo" 1>&2 fi @@ -81,12 +81,12 @@ case "$remote_repo" in *git*) git clone "$remote_repo" "$project_repo_mirror" || - hg --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" + "$hg" --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" ;; *) - hg --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" || + "$hg" --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" || git clone "$remote_repo" "$project_repo_mirror" || - hg clone "$remote_repo" "$project_repo_mirror" + "$hg" clone "$remote_repo" "$project_repo_mirror" ;; esac && success=true @@ -98,10 +98,10 @@ echo "$$: Update successful, pulling into local repo at $local_repo" if [ -d "$project_repo_mirror/.git" ]; then if [ ! -d "$local_repo" ]; then - hg init "$local_repo" + "$hg" init "$local_repo" fi - ( cd "$local_repo" && hg --config extensions.hgext.git= pull "$project_repo_mirror" ) + ( cd "$local_repo" && "$hg" --config extensions.hggit= pull "$project_repo_mirror" ) else - ( cd "$local_repo" && hg pull "$project_repo_mirror" ) + ( cd "$local_repo" && "$hg" pull "$project_repo_mirror" ) fi fi