Permalink
Browse files

Merge branch 'master' of git://github.com/Webconverger/webc

Conflicts:
	etc/webc/live-config.sh
  • Loading branch information...
root
root committed Mar 20, 2012
2 parents 4fa10bb + 2ac45c5 commit 1e076d6afb6a6b119d37b291a6337bf24a82d80d
Showing with 2 additions and 1 deletion.
  1. +2 −1 etc/webc/live-config.sh
View
@@ -41,10 +41,11 @@ for x in $( cmdline ); do
done
install_qa_url=${install_qa_url/&/\&}
+stamp=$( git show $webc_version |grep '^Date')
cp ${link}/content/about.xhtml ${link}/content/about.xhtml.bak
cat ${link}/content/about.xhtml.bak |
-sub_literal 'OS not running' "${webc_version}" |
+sub_literal 'OS not running' "${webc_version} ${stamp}" |
sub_literal 'http://config.webconverger.com' "${install_qa_url}" > ${link}/content/about.xhtml
}

0 comments on commit 1e076d6

Please sign in to comment.