config dir from a http/https subversion repository
Markus Köberl
markus.koeberl at tugraz.at
Thu Feb 5 13:59:50 CET 2009
Hi!
I'd like to submit some small changes to use the config dir from a http/https
subversion repository.
In /etc/fai/fai.conf svn+http is listed as supported URL-type but did not work
for me. With this changes it is possible to use svn+http://server/path and
svn+https://server/path as URL.
$ svn diff
Index: lib/get-config-dir-svn
===================================================================
--- lib/get-config-dir-svn (revision 5246)
+++ lib/get-config-dir-svn (working copy)
@@ -13,6 +13,7 @@
protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^@]*\)@')
svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\([^[:space:]]\+\)')
+svnhttppath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^[:space:]]\+\)')
case $protocol in
svn)
@@ -22,10 +23,12 @@
svnurl="file://$svnpath"
;;
svn+http)
- svnurl="http://$svnpath"
+ svnurl="http://$svnhttppath"
+ svnhttp="true"
;;
svn+https)
- svnurl="https://$svnpath"
+ svnurl="https://$svnhttppath"
+ svnhttp="true"
;;
svn+ssh)
svnurl="svn+ssh://$username@$svnpath"
@@ -39,7 +42,7 @@
esac
[ -n "$username" ] && user="--username $username"
-[ -z "$username" ] && svnurl=$FAI_CONFIG_SRC
+[ -z "$username" ] && [ -z "$svnhttp" ] && svnurl=$FAI_CONFIG_SRC
if [ -d "$FAI/.svn" ] ; then
echo "Updating SVN in $FAI"
--
Markus Köberl
Graz University of Technology
Signal Processing and Speech Communication Laboratory
E-mail: markus.koeberl at tugraz.at
More information about the linux-fai
mailing list